diff --git a/client/src/components/SimpleEnterpriseSelector.vue b/client/src/components/SimpleEnterpriseSelector.vue index b467f6c..ef819c0 100644 --- a/client/src/components/SimpleEnterpriseSelector.vue +++ b/client/src/components/SimpleEnterpriseSelector.vue @@ -151,7 +151,6 @@ 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 05d4c60..5ddc2d1 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,9 +74,7 @@ public class EnterpriseAuditService { if ("update".equals(type)) { EnterpriseAudit audit = enterpriseAuditRepo.findById(enterpriseId).orElseThrow(() -> new RuntimeException("单位信息不存在")); String unifiedSocialCode = enterpriseAudit.getUnifiedSocialCode(); - if (enterpriseAuditRepo.existsByUnifiedSocialCodeAndDelFlagAndEnterpriseIdNot(unifiedSocialCode, (short) 0, enterpriseId) - || enterpriseRepo.existsByUnifiedSocialCodeAndDelFlag(unifiedSocialCode, (short) 0)) - throw new RuntimeException("社会统一信用代码【" + unifiedSocialCode + "】在企业上报审核/企业信息管理已存在"); + ion("社会统一信用代码【" + 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 cb8a43f..3976671 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,10 +80,7 @@ public class EnterpriseService { if ("update".equals(enterprise.getOperate())) { String unifiedSocialCode = enterprise.getUnifiedSocialCode(); String enterpriseId = enterprise.getEnterpriseId(); - if (enterpriseRepo.existsByUnifiedSocialCodeAndDelFlagAndEnterpriseIdNot(unifiedSocialCode, (short) 0, enterpriseId)) - throw new RuntimeException("社会统一信用代码【" + unifiedSocialCode + "】在企业信息管理已存在"); - String legalPhone = enterprise.getLegalPhone(); - if (enterpriseRepo.existsByLegalPhoneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId)) + oneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId)) throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在"); Optional optional = enterpriseRepo.findById(enterpriseId); if (optional.isPresent()) {