浏览代码

文档列表

5 年之前
父节点
当前提交
f935179b62
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10 1
      cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

+ 10 - 1
cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -41,6 +41,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     MouldMapper mouldMapper;
     MouldMapper mouldMapper;
     @Resource
     @Resource
     ProjectUserMapper projectUserMapper;
     ProjectUserMapper projectUserMapper;
+    @Resource
+    ProjectApproveMapper projectApproveMapper;
 
 
     @Override
     @Override
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag) {
     public HttpRespMsg addAndUpdateRole(CompanyVO companyVO, Integer flag) {
@@ -165,7 +167,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             }
             }
             companyVOS = companyMapper.getListMould(mouldIds);
             companyVOS = companyMapper.getListMould(mouldIds);
         } else {
         } else {
-            //此时是项目经理创建其他用户
+            //此时是项目经理
             QueryWrapper<Project> qw = new QueryWrapper<>();
             QueryWrapper<Project> qw = new QueryWrapper<>();
             qw.eq("manager_id", currentUser.getId());
             qw.eq("manager_id", currentUser.getId());
             List<Integer> set = new ArrayList<>();
             List<Integer> set = new ArrayList<>();
@@ -183,6 +185,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                     set.add(projectUser.getProjectId());
                     set.add(projectUser.getProjectId());
                 }
                 }
             }
             }
+            //充当审批人员参与的项目
+            List<ProjectApprove> projectss = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().eq("approver_id", userVO.getId()));
+            if (projectss.size() > 0) {
+                for (ProjectApprove projectUser : projectss) {
+                    set.add(projectUser.getProjectId());
+                }
+            }
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
             List<Integer> mouldIds = new ArrayList<>();
             List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {
             for (Mould mould : moulds) {