diff --git a/client/src/components/SimpleEnterpriseSelector.vue b/client/src/components/SimpleEnterpriseSelector.vue index ef819c0..b467f6c 100644 --- a/client/src/components/SimpleEnterpriseSelector.vue +++ b/client/src/components/SimpleEnterpriseSelector.vue @@ -151,6 +151,7 @@ const handleChange = (val) => { const selectedEnterprise = enterprises.value.find(enterprise => enterprise.enterpriseId === val) selectedEnterprises = selectedEnterprise ? [selectedEnterprise] : [] } + // 触发change事件,传递完整的企业信息 emit('change', props.multiple ? selectedEnterprises : (selectedEnterprises[0] || null)) } diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java index 5ddc2d1..05d4c60 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseAuditService.java @@ -74,7 +74,9 @@ public class EnterpriseAuditService { if ("update".equals(type)) { EnterpriseAudit audit = enterpriseAuditRepo.findById(enterpriseId).orElseThrow(() -> new RuntimeException("单位信息不存在")); String unifiedSocialCode = enterpriseAudit.getUnifiedSocialCode(); - ion("社会统一信用代码【" + unifiedSocialCode + "】在企业上报审核/企业信息管理已存在"); + if (enterpriseAuditRepo.existsByUnifiedSocialCodeAndDelFlagAndEnterpriseIdNot(unifiedSocialCode, (short) 0, enterpriseId) + || enterpriseRepo.existsByUnifiedSocialCodeAndDelFlag(unifiedSocialCode, (short) 0)) + throw new RuntimeException("社会统一信用代码【" + unifiedSocialCode + "】在企业上报审核/企业信息管理已存在"); String legalPhone = enterpriseAudit.getLegalPhone(); if (enterpriseAuditRepo.existsByLegalPhoneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId) || enterpriseRepo.existsByLegalPhoneAndDelFlag(legalPhone, (short) 0)) diff --git a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java index 3976671..cb8a43f 100644 --- a/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java +++ b/server/src/main/java/com/aisino/iles/lawenforcement/service/EnterpriseService.java @@ -80,7 +80,10 @@ public class EnterpriseService { if ("update".equals(enterprise.getOperate())) { String unifiedSocialCode = enterprise.getUnifiedSocialCode(); String enterpriseId = enterprise.getEnterpriseId(); - oneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId)) + if (enterpriseRepo.existsByUnifiedSocialCodeAndDelFlagAndEnterpriseIdNot(unifiedSocialCode, (short) 0, enterpriseId)) + throw new RuntimeException("社会统一信用代码【" + unifiedSocialCode + "】在企业信息管理已存在"); + String legalPhone = enterprise.getLegalPhone(); + if (enterpriseRepo.existsByLegalPhoneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId)) throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在"); Optional optional = enterpriseRepo.findById(enterpriseId); if (optional.isPresent()) {