项目上传，以及人员权限的修改

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

@@ -110,5 +110,19 @@ public class CompanyController {
         return msg;
     }
 
+    /**
+     * 项目分配生产方公司列表
+     * @return
+     */
+    @ApiOperation(value = "项目分配生产方公司列表")
+    @RequestMapping("/addCompanyListToProject")
+    @ResponseBody
+    public HttpRespMsg addCompanyListToProject(User user){
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Company> list = companyService.addCompanyListToProject(user);
+        msg.data = list;
+        return msg;
+    }
+
 }
 

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

@@ -25,4 +25,6 @@ public interface CompanyService extends IService<Company> {
     List<Company> getIdAndNamelist(User user);
 
     HttpRespMsg deleteById(Integer id);
+
+    List<Company> addCompanyListToProject(User user);
 }

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

@@ -82,11 +82,18 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }else{
             //此时是项目经理创建其他用户
             User admin = userMapper.selectOne(new QueryWrapper<User>().eq("id", user.getParentId()));
-            qw.eq("company_type",Constant.ASSETS_COMPANY).or().eq("id",admin.getCompanyId());
+            qw.eq("company_type",Constant.PRODUCER_COMPANY).or().eq("id",admin.getCompanyId());
         }
         return companyMapper.selectList(qw);
     }
 
+    @Override
+    public List<Company> addCompanyListToProject(User user) {
+        QueryWrapper<Company> qw = new QueryWrapper<>();
+        qw.eq("company_type",Constant.PRODUCER_COMPANY);
+        return companyMapper.selectList(qw);
+    }
+
     @Override
     public HttpRespMsg deleteById(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -98,4 +105,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         }
         return msg;
     }
+
+
 }

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

@@ -302,7 +302,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     managerId = project.getManagerId();
                 }
             }
-            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("id", managerId));
+            msg.data = userMapper.selectList(new QueryWrapper<User>().in("company_id", ids).ne("id", adminId).ne("parent_id",Constant.SYS_ID));
         }
         return msg;
     }