diff --git a/client/src/api/lawenforcement/Enterprise.js b/client/src/api/lawenforcement/Enterprise.js index 2672456..630db6b 100644 --- a/client/src/api/lawenforcement/Enterprise.js +++ b/client/src/api/lawenforcement/Enterprise.js @@ -8,7 +8,12 @@ export const enterprises = { findEnterprisesByOrgCode: (query) => api({ url: `${url}/orgcode`, method: REQUEST_METHOD_TYPES.GET, - + params: query + }), + findEnterprisesByAgencyId: (query) => api({ + url: `${url}/agencyid`, + method: REQUEST_METHOD_TYPES.GET, + params: query }), ledgerStatistics(query) {//企业信息统计 return api({ diff --git a/client/src/components/SimpleCheckItemSelector.vue b/client/src/components/SimpleCheckItemSelector.vue index 8d7f154..7693012 100644 --- a/client/src/components/SimpleCheckItemSelector.vue +++ b/client/src/components/SimpleCheckItemSelector.vue @@ -82,7 +82,10 @@ const loadCheckItems = async () => { checkItems.value = res.data || [] loading.value = false - + } catch (error) { + console.error('获取检查项数据失败:', error) + loading.value = false + } } // 处理选择变更 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 d54f004..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 @@ -75,7 +75,14 @@ public class EnterpriseAuditService { EnterpriseAudit audit = enterpriseAuditRepo.findById(enterpriseId).orElseThrow(() -> new RuntimeException("单位信息不存在")); String unifiedSocialCode = enterpriseAudit.getUnifiedSocialCode(); if (enterpriseAuditRepo.existsByUnifiedSocialCodeAndDelFlagAndEnterpriseIdNot(unifiedSocialCode, (short) 0, enterpriseId) - rties(audit, history); + || 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)) + throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在"); + EnterpriseHistory history = new EnterpriseHistory(); + BeanUtils.copyProperties(audit, history); history.setTheType("普通修改"); if (null != user) { history.setHistoryTime(now); 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 7c242ac..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 @@ -83,7 +83,14 @@ public class EnterpriseService { if (enterpriseRepo.existsByUnifiedSocialCodeAndDelFlagAndEnterpriseIdNot(unifiedSocialCode, (short) 0, enterpriseId)) throw new RuntimeException("社会统一信用代码【" + unifiedSocialCode + "】在企业信息管理已存在"); String legalPhone = enterprise.getLegalPhone(); - w); + if (enterpriseRepo.existsByLegalPhoneAndDelFlagAndEnterpriseIdNot(legalPhone, (short) 0, enterpriseId)) + throw new RuntimeException("联系电话【" + legalPhone + "】在企业上报审核/企业信息管理已存在"); + Optional optional = enterpriseRepo.findById(enterpriseId); + if (optional.isPresent()) { + EnterpriseHistory history = new EnterpriseHistory(); + BeanUtils.copyProperties(optional.get(), history); + history.setTheType("普通修改"); + history.setHistoryTime(now); if (null != user) { history.setTheUserName(user.getYhwybs()); history.setTheUserNickName(user.getXm());