修复bug:pc端修改维保负责人

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/controller/CapitalRepairController.java

@@ -221,7 +221,8 @@ public class CapitalRepairController {
     @PostMapping("userList")
     @Validation(fields = {"id", "mtCompanyId"})
     public RestResponse userList(@Val @RequestBody CapitalRepairRequest request){
-        List<ProjectUserResponse> userList = projectUserService.userList(request.getId(), request.getMtCompanyId());
+        List<ProjectUserResponse> userList = projectUserService.userList(request.getId(), request.getMtCompanyId()
+                , request.getUserId(), request.getCurrentRoleCode());
         return RestResponse.success(userList, MessageUtils.get("msg.query.success"));
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectUserController.java

@@ -37,7 +37,8 @@ public class ProjectUserController {
     @PostMapping("user/list")
     @Validation(fields = {"mtCompanyId", "id"})
     public RestResponse userList(@Val @RequestBody ProjectRequest request) {
-        List<ProjectUserResponse> userList = projectUserService.userList(request.getId(),request.getMtCompanyId());
+        List<ProjectUserResponse> userList = projectUserService.userList(request.getId(), request.getMtCompanyId()
+                , request.getUserId(), request.getCurrentRoleCode());
         if (CollUtil.isEmpty(userList)) {
             return RestResponse.success();
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectUserService.java

@@ -36,12 +36,22 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
      * @description 查询项目组成员
      * @date 2019/12/13 2:40 PM
      */
-    public List<ProjectUserResponse> userList(Long projectId, Long mtCompanyId) {
+    public List<ProjectUserResponse> userList(Long projectId, Long mtCompanyId, Long userId, String currentRoleCode) {
         List<ProjectUserResponse> userList = getUserList(projectId, mtCompanyId);
-        return userList.stream().filter(user -> (
-                CommonEnum.DefaultRole.MTWORK.getCode().equals(user.getUserRole())
-                        || CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(user.getUserRole())
-        )).sorted(Comparator.comparing(ProjectUserResponse::getUserRole)).collect(Collectors.toList());
+        List<ProjectUserResponse> workerList = new ArrayList<>();
+        if (CommonEnum.DefaultRole.MTWORK.getCode().equals(currentRoleCode)) {
+            userList.forEach(entry -> {
+                if (Objects.equals(userId, entry.getUserId())) {
+                    workerList.add(entry);
+                }
+            });
+            return workerList;
+        } else {
+            return userList.stream().filter(
+                    entry -> (CommonEnum.DefaultRole.MTWORK.getCode().equals(entry.getUserRole())
+                            || CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(entry.getUserRole())))
+                    .collect(Collectors.toList());
+        }
     }
 
     /**