更改项目组人员的查询逻辑

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/ProjectTeamController.java

@@ -97,7 +97,7 @@ public class ProjectTeamController {
 
 
     /**
-     * 查询***项目的人员列表
+     * 查询***项目的人员列表（分页）
      *
      * @param userInfoVo
      * @return ResMsg
@@ -196,7 +196,7 @@ public class ProjectTeamController {
     }
 
     /**
-     * 根据项目查询项目组人员
+     * 根据项目查询项目组人员（列表）
      *
      * @param
      * @return ResMsg

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/mapper/RelevanceProjectInfoMapper.java

@@ -25,15 +25,19 @@ public interface RelevanceProjectInfoMapper extends JpaRepository<RelevanceProje
     /**
      * 根据项目组id查询关联的人员
      */
-    @Query(value = "SELECT p.user_id userId FROM relevance_project_info p WHERE p.project_team_id = ?1 ",
-            countQuery = "SELECT count(1) FROM relevance_project_info p WHERE p.project_team_id = ?1 ", nativeQuery = true)
+    @Query(value = "SELECT p.user_id userId FROM relevance_project_info p LEFT JOIN work_sys_user w " +
+            " on p.user_id =w.user_id WHERE w.deleted_flag=1 AND p.project_team_id= ?1 ",
+            countQuery = "SELECT p.user_id userId FROM relevance_project_info p LEFT JOIN work_sys_user w " +
+                    " on p.user_id =w.user_id WHERE w.deleted_flag=1 AND p.project_team_id= ?1 ", nativeQuery = true)
     Page<Map<String, Integer>> findByProjectTeamIdEquals(String projectTeamId, Pageable page);
 
     /**
      * 根据项目组id查询关联的人员
      */
-    @Query(value = "SELECT p.user_id userId FROM relevance_project_info p WHERE p.project_team_id = ?1 ",
-            countQuery = "SELECT count(1) FROM relevance_project_info p WHERE p.project_team_id = ?1 ", nativeQuery = true)
+    @Query(value = "SELECT p.user_id userId FROM relevance_project_info p LEFT JOIN work_sys_user w " +
+            "on p.user_id =w.user_id WHERE w.deleted_flag=1 AND p.project_team_id= ?1 ",
+            countQuery = "SELECT p.user_id userId FROM relevance_project_info p LEFT JOIN work_sys_user w " +
+                    "on p.user_id =w.user_id WHERE w.deleted_flag=1 AND p.project_team_id= ?1 ", nativeQuery = true)
     List<String> findByProjectTeamIdEquals(String projectTeamId);
 
     /**

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/service/impl/ProjectTeamServiceImpl.java

@@ -75,7 +75,10 @@ public class ProjectTeamServiceImpl implements ProjectTeamService {
         });
         List<SysUserVo> userList = new ArrayList<>();
         for (String str : list) {
-            userList.add(sysUserController.view(str).getData());
+            SysUserVo data = sysUserController.view(str).getData();
+            if (data != null) {
+                userList.add(data);
+            }
         }
         return new ResMsg(CodeEnum.OK, ResMsg.getMap(userList, byProjectTeamIdEquals.getTotalElements()));
     }