项目文件

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

@@ -134,7 +134,7 @@ public class UserController {
     @ApiOperation("根据公司id获取公司下的人员")
     @RequestMapping("/getUserListByCompanyIds")
     @ResponseBody
-    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id,Integer projectId){
+    public HttpRespMsg getUserListByCompanyIds(String companyIds,Integer id,@RequestParam(required = false) Integer projectId){
         System.out.println("companyIds"+companyIds);
         HttpRespMsg msg = projectService.getUserListByCompanyIds(companyIds,id,projectId);
         return msg;

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

@@ -250,10 +250,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         if (!"".equals(companyIds) && companyIds != null) {
             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
             //该项目的项目经理不能充当参与人
-            Project project = projectMapper.selectById(projectId);
             Integer managerId = -1;
-            if(null != project.getManagerId()){
-                managerId = project.getManagerId();
+            if(projectId != null){
+                Project project = projectMapper.selectById(projectId);
+                if(null != project.getManagerId()){
+                    managerId = project.getManagerId();
+                }
             }
             msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("id",managerId));
         }