非干部月度考核分数汇总

airport-admin/src/main/java/com/sundot/airport/web/controller/personnel/PersonnelNonCadreMonthlyAssessmentScoreSummaryController.java

@@ -126,10 +126,10 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
-     * 各部门参与人数占比 - 按组织架构分类
+     * 各部门参与人数占比
      *
      * @param assessmentMonth 考核月份（格式:YYYYMM）
-     * @return 各部门参与人数及占比
+     * @return 各大队参与人数及占比
      */
     @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
     @GetMapping("/dept-participation")
@@ -143,32 +143,39 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
 
             // 获取所有部门信息
             Map<Long, SysDept> deptMap = getDeptMap();
+            
+            // 构建大队到其所有子部门ID的映射
+            Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(deptMap);
 
-            // 按部门统计人数
-            Map<Long, Integer> deptCountMap = new HashMap<>();
+            // 按大队统计人数
+            Map<Long, Integer> brigadeCountMap = new HashMap<>();
             int totalCount = list.size();
 
             for (PersonnelNonCadreMonthlyAssessment item : list) {
-                Long deptId = getUserDeptId(item.getUserId());
-                if (deptId != null) {
-                    deptCountMap.merge(deptId, 1, Integer::sum);
+                Long userDeptId = getUserDeptId(item.getUserId());
+                if (userDeptId != null) {
+                    // 查找该用户所属的大队
+                    Long brigadeId = findUserBrigade(userDeptId, brigadeSubDeptsMap);
+                    if (brigadeId != null) {
+                        brigadeCountMap.merge(brigadeId, 1, Integer::sum);
+                    }
                 }
             }
 
             // 构建返回结果
             List<DeptParticipationDto> result = new ArrayList<>();
-            for (Map.Entry<Long, Integer> entry : deptCountMap.entrySet()) {
-                Long deptId = entry.getKey();
+            for (Map.Entry<Long, Integer> entry : brigadeCountMap.entrySet()) {
+                Long brigadeId = entry.getKey();
                 Integer count = entry.getValue();
 
                 DeptParticipationDto dto = new DeptParticipationDto();
-                dto.setDeptId(deptId);
+                dto.setDeptId(brigadeId);
 
-                SysDept dept = deptMap.get(deptId);
-                if (dept != null) {
-                    dto.setDeptName(dept.getDeptName());
-                    dto.setDeptType(dept.getDeptType());
-                    dto.setDeptTypeDesc(dept.getDeptTypeDesc());
+                SysDept brigade = deptMap.get(brigadeId);
+                if (brigade != null) {
+                    dto.setDeptName(brigade.getDeptName());
+                    dto.setDeptType(brigade.getDeptType());
+                    dto.setDeptTypeDesc(brigade.getDeptTypeDesc());
                 }
 
                 dto.setCount(count);
@@ -196,9 +203,9 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
-     * 各部门分值分布
+     * 各部门分值分布（按大队级别统计）
      * @param assessmentMonth 考核月份（格式:YYYYMM）
-     * @return 各分数段的部门人数分布
+     * @return 各分数段的大队人数分布
      */
     @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
     @GetMapping("/dept-score-distribution")
@@ -212,20 +219,23 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
 
             // 获取所有部门信息
             Map<Long, SysDept> deptMap = getDeptMap();
+            
+            // 构建大队到其所有子部门ID的映射
+            Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(deptMap);
 
             // 定义6个分数段
             String[] rangeKeys = {"below70", "70-75", "75-80", "80-85", "85-90", "above90"};
             String[] rangeLabels = {"低于70", "[70-75)", "[75-80)", "[80-85)", "[85-90)", "90以上"};
 
-            Map<String, Map<Long, Integer>> rangeDeptCountMap = new LinkedHashMap<>();
+            Map<String, Map<Long, Integer>> rangeBrigadeCountMap = new LinkedHashMap<>();
             for (String rangeKey : rangeKeys) {
-                rangeDeptCountMap.put(rangeKey, new HashMap<>());
+                rangeBrigadeCountMap.put(rangeKey, new HashMap<>());
             }
 
-            // 统计每个分数段下各部门的人数
+            // 统计每个分数段下各大队的人数
             for (PersonnelNonCadreMonthlyAssessment item : list) {
-                Long deptId = getUserDeptId(item.getUserId());
-                if (deptId == null) {
+                Long userDeptId = getUserDeptId(item.getUserId());
+                if (userDeptId == null) {
                     continue;
                 }
 
@@ -234,12 +244,18 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
                     continue;
                 }
 
+                // 查找该用户所属的大队
+                Long brigadeId = findUserBrigade(userDeptId, brigadeSubDeptsMap);
+                if (brigadeId == null) {
+                    continue;
+                }
+
                 // 确定分数段
                 String rangeKey = determineScoreRange(totalScore);
 
-                // 累加该部门在该分数段的人数
-                Map<Long, Integer> deptCountMap = rangeDeptCountMap.get(rangeKey);
-                deptCountMap.merge(deptId, 1, Integer::sum);
+                // 累加该大队在该分数段的人数
+                Map<Long, Integer> brigadeCountMap = rangeBrigadeCountMap.get(rangeKey);
+                brigadeCountMap.merge(brigadeId, 1, Integer::sum);
             }
 
             // 构建返回结果
@@ -249,20 +265,20 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
                 rangeDto.setRangeKey(rangeKeys[i]);
                 rangeDto.setRangeLabel(rangeLabels[i]);
 
-                Map<Long, Integer> deptCountMap = rangeDeptCountMap.get(rangeKeys[i]);
+                Map<Long, Integer> brigadeCountMap = rangeBrigadeCountMap.get(rangeKeys[i]);
                 List<ScoreRangeDistributionDto.DeptCountItemDto> deptCounts = new ArrayList<>();
                 int rangeTotalCount = 0;
 
-                for (Map.Entry<Long, Integer> entry : deptCountMap.entrySet()) {
-                    Long deptId = entry.getKey();
+                for (Map.Entry<Long, Integer> entry : brigadeCountMap.entrySet()) {
+                    Long brigadeId = entry.getKey();
                     Integer count = entry.getValue();
 
                     ScoreRangeDistributionDto.DeptCountItemDto deptItem = new ScoreRangeDistributionDto.DeptCountItemDto();
-                    deptItem.setDeptId(deptId);
+                    deptItem.setDeptId(brigadeId);
 
-                    SysDept dept = deptMap.get(deptId);
-                    if (dept != null) {
-                        deptItem.setDeptName(dept.getDeptName());
+                    SysDept brigade = deptMap.get(brigadeId);
+                    if (brigade != null) {
+                        deptItem.setDeptName(brigade.getDeptName());
                     }
 
                     deptItem.setCount(count);
@@ -344,6 +360,29 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
+     * 构建大队到其所有子部门ID的映射
+     * 用于按大队级别统计，包括大队及其下属所有部门
+     *
+     * @param deptMap 部门映射表
+     * @return 大队ID到其所有子部门ID集合的映射
+     */
+    private Map<Long, Set<Long>> buildBrigadeSubDeptsMap(Map<Long, SysDept> deptMap) {
+        // 获取所有大队部门
+        List<SysDept> allBrigades = deptMap.values().stream()
+                .filter(dept -> "BRIGADE".equals(dept.getDeptType()))
+                .collect(Collectors.toList());
+
+        // 构建大队到其所有子部门ID的映射
+        Map<Long, Set<Long>> brigadeSubDeptsMap = new HashMap<>();
+        for (SysDept brigade : allBrigades) {
+            Set<Long> subDeptIds = getAllSubDeptIds(brigade.getDeptId(), deptMap);
+            brigadeSubDeptsMap.put(brigade.getDeptId(), subDeptIds);
+        }
+        
+        return brigadeSubDeptsMap;
+    }
+
+    /**
      * 汇总统计
      * 统计考核组人数、待改进人数、不称职人数等汇总信息
      *
@@ -440,127 +479,141 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
-     * 各部门实际待改进人员分布
-     * 统计所有实际待改进人员（待改进且未被豁免），按组织架构分类
+     * 各部门实际待改进人员分布（按大队级别统计）
+     * 统计所有实际待改进人员（待改进且未被豁免），按大队分类
      *
      * @param assessmentMonth 考核月份（格式:YYYYMM）
-     * @return 各部门实际待改进人员分布数据
+     * @return 各大队实际待改进人员分布数据
      */
     @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
     @GetMapping("/actual-improvement-distribution")
     public AjaxResult getActualImprovementDistribution(@RequestParam String assessmentMonth) {
         try {
             List<PersonnelNonCadreMonthlyAssessment> list = queryByMonth(assessmentMonth);
-
+    
             if (list == null || list.isEmpty()) {
                 return success(Collections.emptyList());
             }
-
+    
             // 获取所有部门信息
             Map<Long, SysDept> deptMap = getDeptMap();
-
-            // 筛选出实际待改进人员：考核结果为"待改进"且未被豁免
+                
+            // 构建大队到其所有子部门ID的映射
+            Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(deptMap);
+    
+            // 筛选出实际待改进人员：考核结果为“待改进”且未被豁免
             List<PersonnelNonCadreMonthlyAssessment> actualImprovementList = list.stream()
                     .filter(item -> RESULT_IMPROVEMENT.equals(item.getAssessmentResult()))
                     .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))
                     .collect(Collectors.toList());
-
+    
             if (actualImprovementList.isEmpty()) {
                 return success(Collections.emptyList());
             }
-
+    
             // 批量查询用户部门信息，避免N+1问题
             Set<Long> userIds = actualImprovementList.stream()
                     .map(PersonnelNonCadreMonthlyAssessment::getUserId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-
+    
             Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
-
-            // 按部门统计人数
-            Map<Long, Integer> deptCountMap = new HashMap<>();
+    
+            // 按大队统计人数
+            Map<Long, Integer> brigadeCountMap = new HashMap<>();
             int totalCount = actualImprovementList.size();
-
+    
             for (PersonnelNonCadreMonthlyAssessment item : actualImprovementList) {
-                Long deptId = userDeptIdMap.get(item.getUserId());
-                if (deptId != null) {
-                    deptCountMap.merge(deptId, 1, Integer::sum);
+                Long userDeptId = userDeptIdMap.get(item.getUserId());
+                if (userDeptId != null) {
+                    // 查找该用户所属的大队
+                    Long brigadeId = findUserBrigade(userDeptId, brigadeSubDeptsMap);
+                    if (brigadeId != null) {
+                        brigadeCountMap.merge(brigadeId, 1, Integer::sum);
+                    }
                 }
             }
-
+    
             // 构建返回结果
             List<DeptActualImprovementDistributionDto> result = buildDeptDistributionResult(
-                    deptCountMap, deptMap, totalCount, DeptActualImprovementDistributionDto::new);
-
+                    brigadeCountMap, deptMap, totalCount, DeptActualImprovementDistributionDto::new);
+    
             // 按人数降序排序
             result.sort((a, b) -> b.getCount().compareTo(a.getCount()));
-
+    
             return success(result);
         } catch (Exception e) {
-            logger.error("各部门实际待改进人员分布统计异常", e);
+            logger.error("各大队实际待改进人员分布统计异常", e);
             return error("统计失败：" + e.getMessage());
         }
     }
 
     /**
-     * 各部门实际不称职人员分布
-     * 统计所有实际不称职人员（不称职且未被豁免），按组织架构分类
+     * 各部门实际不称职人员分布（按大队级别统计）
+     * 统计所有实际不称职人员（不称职且未被豁免），按大队分类
      *
      * @param assessmentMonth 考核月份（格式:YYYYMM）
-     * @return 各部门实际不称职人员分布数据
+     * @return 各大队实际不称职人员分布数据
      */
     @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
     @GetMapping("/actual-incompetent-distribution")
     public AjaxResult getActualIncompetentDistribution(@RequestParam String assessmentMonth) {
         try {
             List<PersonnelNonCadreMonthlyAssessment> list = queryByMonth(assessmentMonth);
-
+    
             if (list == null || list.isEmpty()) {
                 return success(Collections.emptyList());
             }
-
+    
             // 获取所有部门信息
             Map<Long, SysDept> deptMap = getDeptMap();
-
-            // 筛选出实际不称职人员：考核结果为"不称职"且未被豁免
+                
+            // 构建大队到其所有子部门ID的映射
+            Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(deptMap);
+    
+            // 筛选出实际不称职人员：考核结果为“不称职”且未被豁免
             List<PersonnelNonCadreMonthlyAssessment> actualIncompetentList = list.stream()
                     .filter(item -> RESULT_INCOMPETENT.equals(item.getAssessmentResult()))
                     .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))
                     .collect(Collectors.toList());
-
+    
             if (actualIncompetentList.isEmpty()) {
                 return success(Collections.emptyList());
             }
-
+    
             // 批量查询用户部门信息，避免N+1问题
             Set<Long> userIds = actualIncompetentList.stream()
                     .map(PersonnelNonCadreMonthlyAssessment::getUserId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-
+    
             Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
-
-            // 按部门统计人数
-            Map<Long, Integer> deptCountMap = new HashMap<>();
+    
+            // 按大队统计人数
+            Map<Long, Integer> brigadeCountMap = new HashMap<>();
             int totalCount = actualIncompetentList.size();
-
+    
             for (PersonnelNonCadreMonthlyAssessment item : actualIncompetentList) {
-                Long deptId = userDeptIdMap.get(item.getUserId());
-                if (deptId != null) {
-                    deptCountMap.merge(deptId, 1, Integer::sum);
+                Long userDeptId = userDeptIdMap.get(item.getUserId());
+                if (userDeptId != null) {
+                    // 查找该用户所属的大队
+                    Long brigadeId = findUserBrigade(userDeptId, brigadeSubDeptsMap);
+                    if (brigadeId != null) {
+                        brigadeCountMap.merge(brigadeId, 1, Integer::sum);
+                    }
                 }
             }
-
+    
             // 构建返回结果
             List<DeptActualIncompetentDistributionDto> result = buildDeptDistributionResult(
-                    deptCountMap, deptMap, totalCount, DeptActualIncompetentDistributionDto::new);
-
+                    brigadeCountMap, deptMap, totalCount, DeptActualIncompetentDistributionDto::new);
+    
             // 按人数降序排序
             result.sort((a, b) -> b.getCount().compareTo(a.getCount()));
-
+    
             return success(result);
         } catch (Exception e) {
-            logger.error("各部门实际不称职人员分布统计异常", e);
+            logger.error("各大队实际不称职人员分布统计异常", e);
             return error("统计失败：" + e.getMessage());
         }
     }
@@ -591,6 +644,43 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
+     * 获取指定部门及其所有子部门的ID集合
+     *
+     * @param deptId 部门ID
+     * @param deptMap 部门映射表
+     * @return 包含当前部门及所有子部门的ID集合
+     */
+    private Set<Long> getAllSubDeptIds(Long deptId, Map<Long, SysDept> deptMap) {
+        Set<Long> result = new HashSet<>();
+        result.add(deptId); // 包含当前部门
+        
+        for (SysDept dept : deptMap.values()) {
+            if (dept.getParentId() != null && dept.getParentId().equals(deptId)) {
+                // 递归获取子部门的子部门
+                result.addAll(getAllSubDeptIds(dept.getDeptId(), deptMap));
+            }
+        }
+        
+        return result;
+    }
+
+    /**
+     * 查找用户所属的大队ID
+     *
+     * @param userDeptId 用户所在部门ID
+     * @param brigadeSubDeptsMap 大队到其所有子部门ID的映射
+     * @return 所属大队ID，如果未找到则返回null
+     */
+    private Long findUserBrigade(Long userDeptId, Map<Long, Set<Long>> brigadeSubDeptsMap) {
+        for (Map.Entry<Long, Set<Long>> entry : brigadeSubDeptsMap.entrySet()) {
+            if (entry.getValue().contains(userDeptId)) {
+                return entry.getKey();
+            }
+        }
+        return null;
+    }
+
+    /**
      * 部门分布结果
      */
     private <T> List<T> buildDeptDistributionResult(
@@ -732,6 +822,78 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     }
 
     /**
+     * 各考核组实际不称职人员分布
+     * 统计所有实际不称职人员（不称职且未被豁免），按考核组分类
+     *
+     * @param assessmentMonth 考核月份（格式:YYYYMM）
+     * @return 各考核组实际不称职人员分布数据
+     */
+    @PreAuthorize("@ss.hasPermi('personnel:assessment:query')")
+    @GetMapping("/assessment-team-incompetent-distribution")
+    public AjaxResult getAssessmentTeamIncompetentDistribution(@RequestParam String assessmentMonth) {
+        try {
+            List<PersonnelNonCadreMonthlyAssessment> list = queryByMonth(assessmentMonth);
+
+            if (list == null || list.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 筛选出实际不称职人员：考核结果为"不称职"且未被豁免，且考核组不为空
+            List<PersonnelNonCadreMonthlyAssessment> actualIncompetentList = list.stream()
+                    .filter(item -> RESULT_INCOMPETENT.equals(item.getAssessmentResult()))
+                    .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))
+                    .filter(item -> item.getAssessmentTeam() != null && !item.getAssessmentTeam().isEmpty())
+                    .collect(Collectors.toList());
+
+            if (actualIncompetentList.isEmpty()) {
+                return success(Collections.emptyList());
+            }
+
+            // 按考核组统计人数
+            Map<String, Integer> teamCountMap = new HashMap<>();
+            int totalCount = actualIncompetentList.size();
+
+            for (PersonnelNonCadreMonthlyAssessment item : actualIncompetentList) {
+                String assessmentTeam = item.getAssessmentTeam();
+                if (assessmentTeam != null && !assessmentTeam.isEmpty()) {
+                    teamCountMap.merge(assessmentTeam, 1, Integer::sum);
+                }
+            }
+
+            // 构建返回结果
+            List<AssessmentTeamActualIncompetentDistributionDto> result = new ArrayList<>();
+            for (Map.Entry<String, Integer> entry : teamCountMap.entrySet()) {
+                String assessmentTeam = entry.getKey();
+                Integer count = entry.getValue();
+
+                AssessmentTeamActualIncompetentDistributionDto dto = new AssessmentTeamActualIncompetentDistributionDto();
+                dto.setAssessmentTeam(assessmentTeam);
+                dto.setCount(count);
+
+                // 计算占比
+                if (totalCount > 0) {
+                    BigDecimal percentage = new BigDecimal(count)
+                            .divide(new BigDecimal(totalCount), 4, BigDecimal.ROUND_HALF_UP)
+                            .multiply(HUNDRED);
+                    dto.setPercentage(percentage.setScale(1, BigDecimal.ROUND_HALF_UP));
+                } else {
+                    dto.setPercentage(BigDecimal.ZERO);
+                }
+
+                result.add(dto);
+            }
+
+            // 按人数降序排序
+            result.sort((a, b) -> b.getCount().compareTo(a.getCount()));
+
+            return success(result);
+        } catch (Exception e) {
+            logger.error("各考核组实际不称职人员分布统计异常", e);
+            return error("统计失败：" + e.getMessage());
+        }
+    }
+
+    /**
      * 大队考核组统计
      * 先按大队筛选，再按考核组统计，应用汇总统计规则
      *
@@ -761,13 +923,16 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
 
             Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
 
-            // 如果指定了大队ID，先筛选该大队的人员
+            // 如果指定了大队ID，先筛选该大队的人员（包括大队及其所有子部门）
             List<PersonnelNonCadreMonthlyAssessment> filteredList = allList;
             if (deptId != null) {
+                // 获取该大队及其所有子部门的ID集合
+                Set<Long> brigadeSubDeptIds = getAllSubDeptIds(deptId, deptIdMap);
+                
                 filteredList = allList.stream()
                         .filter(item -> {
                             Long userDeptId = userDeptIdMap.get(item.getUserId());
-                            return deptId.equals(userDeptId);
+                            return userDeptId != null && brigadeSubDeptIds.contains(userDeptId);
                         })
                         .collect(Collectors.toList());
             }
@@ -918,20 +1083,25 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
             if (allList == null || allList.isEmpty()) {
                 return success(Collections.emptyList());
             }
-
-
+            
+            // 获取所有部门信息
+            Map<Long, SysDept> deptMap = getDeptMap();
+            
             Set<Long> userIds = allList.stream()
                     .map(PersonnelNonCadreMonthlyAssessment::getUserId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-
+            
             Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
-
-            // 筛选指定大队的实际待改进人员：属于该大队、考核结果为"待改进"且未被豁免、考核组不为空
+            
+            // 获取该大队及其所有子部门的ID集合
+            Set<Long> brigadeSubDeptIds = getAllSubDeptIds(deptId, deptMap);
+            
+            // 筛选指定大队的实际待改进人员：属于该大队（包括子部门）、考核结果为“待改进”且未被豁免、考核组不为空
             List<PersonnelNonCadreMonthlyAssessment> actualImprovementList = allList.stream()
                     .filter(item -> {
                         Long userDeptId = userDeptIdMap.get(item.getUserId());
-                        return deptId.equals(userDeptId);
+                        return userDeptId != null && brigadeSubDeptIds.contains(userDeptId);
                     })
                     .filter(item -> RESULT_IMPROVEMENT.equals(item.getAssessmentResult()))
                     .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))
@@ -1005,20 +1175,25 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
             if (allList == null || allList.isEmpty()) {
                 return success(Collections.emptyList());
             }
-
-
+            
+            // 获取所有部门信息
+            Map<Long, SysDept> deptMap = getDeptMap();
+            
             Set<Long> userIds = allList.stream()
                     .map(PersonnelNonCadreMonthlyAssessment::getUserId)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
-
+            
             Map<Long, Long> userDeptIdMap = buildUserDeptIdMap(userIds);
-
-            // 筛选指定大队的实际不称职人员：属于该大队、考核结果为"不称职"且未被豁免、考核组不为空
+            
+            // 获取该大队及其所有子部门的ID集合
+            Set<Long> brigadeSubDeptIds = getAllSubDeptIds(deptId, deptMap);
+            
+            // 筛选指定大队的实际不称职人员：属于该大队（包括子部门）、考核结果为“不称职”且未被豁免、考核组不为空
             List<PersonnelNonCadreMonthlyAssessment> actualIncompetentList = allList.stream()
                     .filter(item -> {
                         Long userDeptId = userDeptIdMap.get(item.getUserId());
-                        return deptId.equals(userDeptId);
+                        return userDeptId != null && brigadeSubDeptIds.contains(userDeptId);
                     })
                     .filter(item -> RESULT_INCOMPETENT.equals(item.getAssessmentResult()))
                     .filter(item -> !EXEMPTION_YES.equals(item.getExemption()))