diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java index f406f5b..a9006b9 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java @@ -368,20 +368,12 @@ public class ComplianceCheckUtil { // 3. 构建人员→可担任专业能力code集合(同一人可能具备多个专业能力) Map> personCapabilityMap = new HashMap<>(); - for (IndustryProfessionalPersonCo industryProfessionalPersonCo : industryProfessionalPersonCos) { - Set codeList = personCapabilityMap - .getOrDefault(industryProfessionalPersonCo.getSourcePersonnelId(), new HashSet<>()); - codeList.add(industryProfessionalPersonCo.getProfessionalCapabilityCode()); - personCapabilityMap.put(industryProfessionalPersonCo.getSourcePersonnelId() - , codeList); - } - - for (OrgPersonnelCertCapabilityComplianceCheckCO industryProfessionalPersonCo : certCapabilityList) { - Set codeList = personCapabilityMap - .getOrDefault(industryProfessionalPersonCo.getPersonnelId(), new HashSet<>()); - codeList.add(industryProfessionalPersonCo.getProfessionalCapabilityCode()); - personCapabilityMap.put(industryProfessionalPersonCo.getPersonnelId(), codeList); - } + industryProfessionalPersonCos.forEach(p -> + personCapabilityMap.computeIfAbsent(p.getSourcePersonnelId(), k -> new HashSet<>()) + .add(p.getProfessionalCapabilityCode())); + certCapabilityList.forEach(c -> + personCapabilityMap.computeIfAbsent(c.getPersonnelId(), k -> new HashSet<>()) + .add(c.getProfessionalCapabilityCode())); // 数据来源:industryProfessionalPersonCos(备案人员自带专业能力)+ certCapabilityList(证书专业能力)