diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java index ca8132cf..a74306e5 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/support/OrgPersonnelExcelImporter.java @@ -198,7 +198,7 @@ public class OrgPersonnelExcelImporter { // 行内枚举/数据校验未通过,已记录异常 continue; } - List personnelCertEntities = buildOrgPersonnelCert(row, errors, personnelEntity); + List personnelCertEntities = buildOrgPersonnelCert(row, errors); Long userId = addUserIfAbsentAndAppendRole(personnelEntity); personnelEntity.setId(userId); @@ -227,11 +227,10 @@ public class OrgPersonnelExcelImporter { * * @param row row * @param errors errors - * @param personnelEntity personnelEntity * @return OrgPersonnelCertEntity */ private List buildOrgPersonnelCert(OrgPersonnelImportRow row - , List errors, OrgPersonnelEntity personnelEntity) { + , List errors) { List personnelCertEntities = row.getBasic().getPersonnelCertEntities(); if (CollectionUtils.isEmpty(personnelCertEntities)) { return Collections.emptyList(); @@ -240,6 +239,7 @@ public class OrgPersonnelExcelImporter { List orgPersonnelCertDOList = new ArrayList<>(personnelCertEntities.size()); for (OrgPersonnelCertEntity personnelCertEntity : personnelCertEntities) { OrgPersonnelCertDO orgPersonnelCertDO = orgPersonnelCertConvertor.entityToDO(personnelCertEntity); + InsertFieldDefaults.apply(orgPersonnelCertDO); orgPersonnelCertDO.setOrgId(personnelCertEntity.getOrgId()); orgPersonnelCertDOList.add(orgPersonnelCertDO); } @@ -369,7 +369,7 @@ public class OrgPersonnelExcelImporter { * 任一不通过记录异常并返回 null。 *

*/ - private Boolean matchCapability(@UnknownNullability OrgPersonnelImportRow row + private Boolean matchCapability(OrgPersonnelImportRow row , Map> capabilityMap, List errors) { List capabilityList = capabilityMap.get(trim(row.getBasic().getIdCardNo()));