1.项目成员列表筛选维保工和区域主管

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

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
@@ -36,7 +37,7 @@ public class ProjectUserController {
      */
     @PostMapping("user/list")
     public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
-        List<ProjectUser> userList = projectUserService.userList(request.getId());
+        List<ProjectUserResponse> userList = projectUserService.userList(request.getId());
         if (CollUtil.isEmpty(userList)) {
             return RestResponse.success();
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectUserMapper.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.project.dao.mapper;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
 
-    List<ProjectUser> findUserListById(@Param("projectId") Long projectId);
+    List<ProjectUserResponse> findUserListById(@Param("projectId") Long projectId);
 
     /**
      * @param projectId 项目id

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.project.service;
 
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -28,8 +31,12 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
      * @description 查询项目组成员
      * @date 2019/12/13 2:40 PM
      */
-    public List<ProjectUser> userList(Long projectId) {
-        return projectUserMapper.findUserListById(projectId);
+    public List<ProjectUserResponse> userList(Long projectId) {
+        List<ProjectUserResponse> userList = projectUserMapper.findUserListById(projectId);
+        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());
     }
 
     /**

lift-business-service/src/main/resources/mapper/project/ProjectUserMapper.xml

@@ -23,7 +23,6 @@
 		FROM project_user pu
 		LEFT JOIN user_info ui ON pu.user_id = ui.user_id
 		WHERE project_id = #{projectId,jdbcType=BIGINT}
-        ORDER BY pu.user_role
 	</select>
 
 	<!--app端 根据项目id获取项目人员名称和头像地址 -->