Merge remote-tracking branch 'origin/dev-tmp1' into dev-tmp1

dev-tmp1
zhanglei 2026-08-19 10:39:28 +08:00
commit 66b6ddb8d5
1 changed files with 1 additions and 1 deletions

View File

@ -206,6 +206,7 @@ public class OrgPersonnelExcelImporter {
transactionTemplate.execute(status -> {
orgPersonnelDomainService.add(personnelEntity);
if (!CollectionUtils.isEmpty(personnelCertEntities)) {
personnelCertEntities.forEach(it -> it.setPersonnelId(personnelEntity.getId()));
Db.saveBatch(personnelCertEntities);
}
return null;
@ -238,7 +239,6 @@ public class OrgPersonnelExcelImporter {
List<OrgPersonnelCertDO> orgPersonnelCertDOList = new ArrayList<>(personnelCertEntities.size());
for (OrgPersonnelCertEntity personnelCertEntity : personnelCertEntities) {
personnelCertEntity.setPersonnelId(personnelEntity.getId());
OrgPersonnelCertDO orgPersonnelCertDO = orgPersonnelCertConvertor.entityToDO(personnelCertEntity);
orgPersonnelCertDO.setOrgId(personnelCertEntity.getOrgId());
orgPersonnelCertDOList.add(orgPersonnelCertDO);