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 bafbf127..74794208 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 @@ -11,7 +11,6 @@ import com.jjb.saas.system.client.user.request.RoleDeptAddCmd; import com.jjb.saas.system.client.user.request.UserAddCmd; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; -import org.jetbrains.annotations.UnknownNullability; import org.qinan.safetyeval.client.co.OrgPersonnelImportErrorCO; import org.qinan.safetyeval.client.co.OrgPersonnelImportResultCO; import org.qinan.safetyeval.domain.constant.CertTypeCodeEnum; @@ -199,8 +198,8 @@ public class OrgPersonnelExcelImporter { } List personnelCertEntities = buildOrgPersonnelCert(row, errors); Long userId = addUserIfAbsentAndAppendRole(personnelEntity); - personnelEntity.setIsCertComplete(false); personnelEntity.setId(userId); + personnelEntity.setIsCertComplete(false); transactionTemplate.execute(status -> { orgPersonnelDomainService.add(personnelEntity); @@ -224,8 +223,8 @@ public class OrgPersonnelExcelImporter { /** * - * @param row row - * @param errors errors + * @param row row + * @param errors errors * @return OrgPersonnelCertEntity */ private List buildOrgPersonnelCert(OrgPersonnelImportRow row