项目文件

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

@@ -79,16 +79,16 @@ public class ProjectController {
 
     /**
      * 项目详情
-     * 参数: id 项目id
+     * 参数: id 项目id,token 用户凭证
      *
      * @return
      */
     @ApiOperation("项目详情")
     @RequestMapping("/detail")
     @ResponseBody
-    public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project) {
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project,String token) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = projectService.getProjectDetail(project);
+        msg = projectService.getProjectDetail(project,token);
         return msg;
     }
 

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

@@ -127,16 +127,16 @@ public class UserController {
 
     /**
      * 给项目分配参与人的时候根据公司id获取公司下的人员
-     * 参数：companyIds 公司ids ,id当前操作人的id
+     * 参数：companyIds 公司ids ,id当前操作人的id,projectId 项目id
      *
      * @return
      */
     @ApiOperation("根据公司id获取公司下的人员")
     @RequestMapping("/getUserListByCompanyIds")
     @ResponseBody
-    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id){
+    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id,Integer projectId){
         System.out.println("companyIds"+companyIds);
-        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id);
+        HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id,projectId);
         return msg;
     }
 

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

@@ -28,9 +28,9 @@ public interface ProjectService extends IService<Project> {
 
     HttpRespMsg getUserByCompanyIdOrSubordinateType(User user);
 
-    HttpRespMsg getProjectDetail(Project project);
+    HttpRespMsg getProjectDetail(Project project,String token);
 
-    HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId);
+    HttpRespMsg getUserListByCompanyIds(String companyIds,Integer adminId,Integer projectId);
 
     HttpRespMsg getModelListByCompanyId(User user);
 

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

@@ -225,7 +225,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getProjectDetail(Project project) {
+    public HttpRespMsg getProjectDetail(Project project,String token) {
         HttpRespMsg msg = new HttpRespMsg();
         ProjectVO vo = projectMapper.getProjectById(project.getId());
         List<User> users = projectMapper.getProjectUserById(project.getId());
@@ -245,11 +245,17 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
     @Override
-    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId) {
+    public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId,Integer projectId) {
         HttpRespMsg msg = new HttpRespMsg();
         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));
+            //该项目的项目经理不能充当参与人
+            Project project = projectMapper.selectById(projectId);
+            Integer managerId = -1;
+            if(null != project.getManagerId()){
+                managerId = project.getManagerId();
+            }
+            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("id",managerId));
         }
         return msg;
     }