Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectController.java

@@ -33,6 +33,7 @@ public class ProjectController{
      * 参数：projectName 项目名 ,customerCompanyIds 客户方公司ids "1,2,3",customerCompanyNames 客户方公司名字“1,2,3”
      * managerId 项目经理id  manager 项目经理name
      * 修改时/添加时分配项目: id 项目id ，userIds 参与项目的用户id 如：“1,2,3”(多个或者一个)()
+     * customerApproverId 生产方审批人id，ownerApproverId 资产方审批人id
      * managerId 项目经理id 非必传，managerId 项目经理  modelIds 模具ids 如 :"1,2,3"
      * flag 0-添加，1-修改
      *
@@ -42,12 +43,14 @@ public class ProjectController{
     @RequestMapping("/add")
     @ResponseBody
     public HttpRespMsg addAndUpdateProject(Project project, HttpServletRequest request, Integer flag,String customerCompanyIds,
-                                           String customerCompanyNames, String token,@RequestParam(required = false) String userIds,String modelIds) {
+                                           @RequestParam(required = false)Integer customerApproverId,String customerCompanyNames,
+                                           @RequestParam(required = false)Integer ownerApproverId,String modelIds,
+                                            String token,@RequestParam(required = false) String userIds) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("head_imgurl",token);
         User user = userService.getOne(qw);
-        msg = projectService.addAndUpdateProject(project, flag, user,userIds,customerCompanyIds,customerCompanyNames,modelIds);
+        msg = projectService.addAndUpdateProject(project, flag, user,userIds,customerCompanyIds,customerCompanyNames,modelIds,ownerApproverId,customerApproverId);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldEquipment.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -37,12 +39,14 @@ public class MouldEquipment extends Model<MouldEquipment> {
      * 启动时间
      */
     @TableField("start_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Project.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -91,6 +93,7 @@ public class Project extends Model<Project> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
     /**

cloud-model/src/main/java/com/hssx/cloudmodel/entity/UserCompany.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.io.Serializable;
 
 /**
@@ -49,6 +51,7 @@ public class UserCompany extends Model<UserCompany> {
      * 创建时间
      */
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime indate;
 
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/ProjectService.java

@@ -7,6 +7,7 @@ import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
@@ -18,7 +19,8 @@ import com.hssx.cloudmodel.util.PageUtil;
  */
 public interface ProjectService extends IService<Project> {
 
-    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,String customerCompanyIds,String customerCompanyNames,String modelIds);
+    HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user, String userIds, String customerCompanyIds, String customerCompanyNames,
+                                    String modelIds,Integer customerApproverId,Integer ownerApproverId);
 
     HttpRespMsg handOutProject(Project project, String userIds);
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectApproveServiceImpl.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.constant.Constant;
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.ProjectApprove;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
@@ -36,15 +37,18 @@ public class ProjectApproveServiceImpl extends ServiceImpl<ProjectApproveMapper,
             if(Constant.SYS_ID == user.getParentId()){
                 //资产方管理员
                 User examiner = userMapper.selectById(projectApprove.getApproverId());
-
+                Company company = companyMapper.selectById(examiner.getCompanyId());
                 projectApprove.setApproverName(examiner.getUsername());
                 projectApprove.setCompanyId(examiner.getCompanyId());
+                projectApprove.setCompanyName(company.getCompanyName());
+                projectApprove.setSubordinateType(examiner.getSubordinateType());
+                projectApproveMapper.insert(projectApprove);
             }else{
                 msg.setError("对不起，您没有操作该功能的权限");
             }
         }else{
             msg.setError("用户未登录或不存在");
         }
-        return null;
+        return msg;
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -45,12 +45,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     CustomCompanyMapper customCompanyMapper;
     @Resource
     MouldMapper mouldMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
 
     @Override
-    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user,String userIds,
-                                           String customerCompanyIds,String customerCompanyNames,String modelIds) {
+    public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user, String userIds,
+                                           String customerCompanyIds, String customerCompanyNames, String modelIds,
+                                           Integer customerApproverId, Integer ownerApproverId) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(user != null){
+        if (user != null) {
             QueryWrapper<Project> qw = new QueryWrapper<>();
             qw.orderByDesc("id").last("limit 1");
             Project lastProject = projectMapper.selectOne(qw);
@@ -71,14 +74,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     project.setCreator(user.getUsername());
                     project.setOwnerCompany(user.getCompanyId());
                     project.setOwnerCompanyName(company.getCompanyName());
-                    project.setProjectNo(Constant.PROJECT_PREFIX+seq);
+                    project.setProjectNo(Constant.PROJECT_PREFIX + seq);
                     projectMapper.insert(project);
                     //添加生产方关联公司
-                    if(customerCompanyIds != null && !"".equals(customerCompanyIds) && customerCompanyNames != null && !"".equals(customerCompanyNames)){
+                    if (customerCompanyIds != null && !"".equals(customerCompanyIds) && customerCompanyNames != null && !"".equals(customerCompanyNames)) {
                         List<Integer> ides = ListUtil.convertIntegerIdsArrayToList(customerCompanyIds);
                         String[] split = customerCompanyNames.split(",");
                         int index = 0;
-                        for(String cusCompany:split){
+                        for (String cusCompany : split) {
                             CustomCompany customCompany = new CustomCompany();
                             customCompany.setCompanyId(ides.get(index));
                             customCompany.setCompanyName(cusCompany);
@@ -88,32 +91,55 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         }
                     }
                 }
-            }else if(flag == 1){
+            } else if (flag == 1) {
                 projectMapper.updateById(project);
+                //删除之前的项目审批人
+                projectApproveMapper.delete(new QueryWrapper<ProjectApprove>().eq("project_id", project.getId()));
+                //重新添加审批人
+                //1.添加资产方审批人
+                User customerExaminer = userMapper.selectById(customerApproverId);
+                Company company = companyMapper.selectById(customerExaminer.getCompanyId());
+                ProjectApprove projectApprove = new ProjectApprove();
+                projectApprove.setApproverName(customerExaminer.getUsername());
+                projectApprove.setCompanyId(customerExaminer.getCompanyId());
+                projectApprove.setCompanyName(company.getCompanyName());
+                projectApprove.setProjectId(project.getId());
+                projectApprove.setSubordinateType(customerExaminer.getSubordinateType());
+                projectApproveMapper.insert(projectApprove);
+                //2.添加生产方审批人
+                User ownerExaminer = userMapper.selectById(ownerApproverId);
+                company = companyMapper.selectById(ownerExaminer.getCompanyId());
+                ProjectApprove ownerProjectApprove = new ProjectApprove();
+                ownerProjectApprove.setApproverName(ownerExaminer.getUsername());
+                ownerProjectApprove.setCompanyId(ownerExaminer.getCompanyId());
+                ownerProjectApprove.setCompanyName(company.getCompanyName());
+                ownerProjectApprove.setProjectId(project.getId());
+                ownerProjectApprove.setSubordinateType(ownerExaminer.getSubordinateType());
+                projectApproveMapper.insert(ownerProjectApprove);
                 //删除之前分配的人员
                 QueryWrapper<ProjectUser> qwPro = new QueryWrapper<>();
-                qwPro.eq("project_id",project.getId());
+                qwPro.eq("project_id", project.getId());
                 projectUserMapper.delete(qwPro);
                 //再次重新分配
                 this.handOutProject(project, userIds);
                 //删除之前分配与项目关联的模具,即将之前的关联项目id修改成未关联
                 mouldMapper.updateMouldByProjectId(project);
                 //再次模具的分配
-                if(modelIds != null && !"".equals(modelIds)){
+                if (modelIds != null && !"".equals(modelIds)) {
                     List<Integer> modelList = ListUtil.convertIntegerIdsArrayToList(modelIds);
                     int index = 1;
-                    if(modelList.size()>0){
+                    if (modelList.size() > 0) {
                         for (Integer id : modelList) {
                             Mould mould = new Mould();
                             mould.setId(id);
                             mould.setProjectId(project.getId());
-                            mould.setBelongProjectGrade(index/modelList.size()+"");
+                            mould.setBelongProjectGrade(index / modelList.size() + "");
                             mouldMapper.updateById(mould);
                         }
                     }
                 }
             }
-        }else{
+        } else {
             msg.setError("当前角色涉及权限问题，请重新登录");
         }
         return msg;
@@ -124,10 +150,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         HttpRespMsg msg = new HttpRespMsg();
         Project pro = projectMapper.selectById(project.getId());
         List<Integer> ids = new ArrayList<>();
-        if(userIds != null && userIds != ""){
+        if (userIds != null && userIds != "") {
             List<String> list = ListUtil.convertLongIdsArrayToList(userIds);
-            if(list().size()>0){
-                for(String id:list){
+            if (list().size() > 0) {
+                for (String id : list) {
                     User user = userMapper.selectById(id);
                     ProjectUser projectUser = new ProjectUser();
                     projectUser.setId(Integer.parseInt(id));
@@ -136,27 +162,27 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     projectUserMapper.insert(projectUser);
                 }
             }
-        }else{
+        } else {
             msg.setError("用户id不能为null和空");
         }
         return msg;
     }
 
     @Override
-    public HttpRespMsg getList(String keyName,PageUtil page,User currentUser) {
+    public HttpRespMsg getList(String keyName, PageUtil page, User currentUser) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(currentUser != null){
-            PageHelper.startPage(page.getPageNum(),page.getPageSize());
-            List<Project> projects = projectMapper.getProjectListByUid(keyName,currentUser);
+        if (currentUser != null) {
+            PageHelper.startPage(page.getPageNum(), page.getPageSize());
+            List<Project> projects = projectMapper.getProjectListByUid(keyName, currentUser);
             PageInfo<Project> pageInfos = new PageInfo<>(projects);
             msg.data = pageInfos;
-        }else{
+        } else {
             msg.setError("当前用户不存，或涉及到权限问题，请重新登录");
         }
         QueryWrapper<Project> qw = new QueryWrapper<>();
-        qw.select("project_name", "creator","charger","indate");
-        if(keyName != null){
-            qw.like("project_name",keyName);
+        qw.select("project_name", "creator", "charger", "indate");
+        if (keyName != null) {
+            qw.like("project_name", keyName);
         }
         return msg;
     }
@@ -165,10 +191,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public HttpRespMsg getUserByCompanyIdOrSubordinateType(User user) {
         HttpRespMsg msg = new HttpRespMsg();
         List<User> users = new ArrayList<>();
-        QueryWrapper<User>qw = new QueryWrapper<>();
-        if(user.getCompanyId() != null){
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        if (user.getCompanyId() != null) {
             qw.eq("company_id", user.getCompanyId());
-        }else if(user.getSubordinateType() != null){
+        } else if (user.getSubordinateType() != null) {
             qw.eq("subordinate_type", user.getSubordinateType());
         }
         users = userMapper.selectList(qw);
@@ -183,10 +209,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<User> users = projectMapper.getProjectUserById(project.getId());
         //处理users按照客户呼和供应商分组
         for (User user : users) {
-            if(user.getSubordinateType()==0){
+            if (user.getSubordinateType() == 0) {
                 //资产方
                 vo.getOwnerUsers().add(user);
-            }else if(user.getSubordinateType()==1){
+            } else if (user.getSubordinateType() == 1) {
                 //生产方
                 vo.getCustomUsers().add(user);
             }
@@ -196,11 +222,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId) {
+    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId) {
         HttpRespMsg msg = new HttpRespMsg();
-        if(!"".equals(companyIds) && companyIds != null){
+        if (!"".equals(companyIds) && companyIds != null) {
             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
-            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id",ids).ne("id",adminId));
+            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId));
         }
         return msg;
     }
@@ -209,19 +235,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     public HttpRespMsg getModelListByCompanyId(User user) {
         HttpRespMsg msg = new HttpRespMsg();
         QueryWrapper<Mould> qw = new QueryWrapper<>();
-        if(Constant.SYS_ID == user.getParentId()){
+        if (Constant.SYS_ID == user.getParentId()) {
             //此时是admin
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getId()));
-            qw.eq("company_id",admin.getCompanyId());
-        }else if(Constant.SYS_PARENT_ID == user.getParentId()){
+            qw.eq("company_id", admin.getCompanyId());
+        } else if (Constant.SYS_PARENT_ID == user.getParentId()) {
             //系统管理员
 //            qw.eq("company_type",Constant.ASSETS_COMPANY);
-        }else{
+        } else {
             //此时是项目经理
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
-            qw.eq("company_id",admin.getCompanyId());
+            qw.eq("company_id", admin.getCompanyId());
         }
-        msg.data =  mouldMapper.selectList(qw);
+        msg.data = mouldMapper.selectList(qw);
         return msg;
     }
 
@@ -231,41 +257,41 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<Integer> set = new ArrayList<>();
         set.add(-1);
         List<MouldVO> moulds = new ArrayList<>();
-        if(userVO.getId() != null){
+        if (userVO.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
-            PageHelper.startPage(page.getPageNum(),page.getPageSize());
-            if(Constant.SYS_PARENT_ID == userVO.getParentId()){
+            PageHelper.startPage(page.getPageNum(), page.getPageSize());
+            if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
                 moulds = mouldMapper.selectListByCondition(userVO);
-            }else if(Constant.SYS_ID == userVO.getParentId()){
+            } else if (Constant.SYS_ID == userVO.getParentId()) {
                 moulds = mouldMapper.selectListByCondition(userVO);
-            }else{
+            } else {
                 //普通用户或者项目经理
                 //充当项目经理参与的项目
-                if(userVO.getProjectId() != -1){
+                if (userVO.getProjectId() != -1) {
                     set.add(userVO.getProjectId());
-                    moulds = mouldMapper.selectListByConditionByProject(userVO,set);
-                }else{
+                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
+                } else {
                     QueryWrapper<Project> qw = new QueryWrapper<>();
                     qw.eq("manager_id", userVO.getId());
                     List<Project> projects = projectMapper.selectList(qw);
-                    if(projects.size()>0){
+                    if (projects.size() > 0) {
                         for (Project project : projects) {
                             set.add(project.getId());
                         }
                     }
 //                //充当普通人员参与的项目
                     List<ProjectUser> projectUsers = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().eq("user_id", userVO.getId()));
-                    if(projectUsers.size()>0){
+                    if (projectUsers.size() > 0) {
                         for (ProjectUser projectUser : projectUsers) {
                             set.add(projectUser.getProjectId());
                         }
                     }
-                    moulds = mouldMapper.selectListByConditionByProject(userVO,set);
+                    moulds = mouldMapper.selectListByConditionByProject(userVO, set);
                 }
             }
             PageInfo<MouldVO> pageInfo = new PageInfo<>(moulds);
             msg.data = pageInfo;
-        }else{
+        } else {
             msg.setError("用户不存在，或者未登录！");
         }
         return msg;
@@ -277,18 +303,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<Integer> ides = new ArrayList<>();
         ides.add(-1);
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
-        List<Project>projects = new ArrayList<>();
-        if(user != null){
+        List<Project> projects = new ArrayList<>();
+        if (user != null) {
             QueryWrapper<Project> qw = new QueryWrapper<>();
-            qw.select("id","project_name");
-            if(Constant.SYS_PARENT_ID == user.getParentId()){
+            qw.select("id", "project_name");
+            if (Constant.SYS_PARENT_ID == user.getParentId()) {
                 //系统超级管理员，可获得所有项目
                 projects = projectMapper.selectList(qw);
-            }else if(Constant.SYS_ID == user.getParentId()){
+            } else if (Constant.SYS_ID == user.getParentId()) {
                 //资产方管理员
-                qw.eq("owner_company",user.getCompanyId());
+                qw.eq("owner_company", user.getCompanyId());
                 projects = projectMapper.selectList(qw);
-            }else{
+            } else {
                 QueryWrapper<Project> qwPro = new QueryWrapper<>();
                 qwPro.eq("manager_id", user.getId());
                 List<Project> projectList = projectMapper.selectList(qw);
@@ -300,11 +326,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 for (ProjectUser projectUser : projectUsers) {
                     ides.add(projectUser.getProjectId());
                 }
-                qw.in("id",ides);
+                qw.in("id", ides);
                 projects = projectMapper.selectList(qw);
             }
             msg.data = projects;
-        }else{
+        } else {
             msg.setError("当前用户未登录，或者用户不存在");
         }
         return msg;

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -72,7 +72,7 @@
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         select
-        tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
+        tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
@@ -106,10 +106,10 @@
     </select>
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
-        tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name
-        projectName,tbm.initial_modulus initial_modulus,tbc.company_name companyName,tbmp.hill_number hillNumber,
-        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no
-        equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
+        tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,
+        tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName
         from
         tb_mould tbm
         left join
@@ -141,7 +141,8 @@
 
     <select id="getDetailById" resultMap="BaseResultMapVO">
     select
-        tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
+        tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,
         tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life
         from

cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -53,7 +53,7 @@
         on p.id = pu.project_id
         <where>
             <if test="currentUser.id != 1">
-                pu.user_id = #{currentUser.id}
+                pu.user_id = #{currentUser.id} OR p.`creator_id` = #{currentUser.id} OR p.`manager_id` = #{currentUser.id}
             </if>
             <if test="keyName != null and keyName != ''">
                 p.project_name like concat('%',#{keyName},'%')