From f97e83814d0c4237b93f2bea48fc3d1a3e57d7d1 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 7 Feb 2024 09:40:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080755=20=E5=88=A0=E9=99=A4=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8E=EF=BC=8C=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E6=95=B0=E6=8D=AE=E6=B2=A1=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BD=86=E7=82=B9=E5=87=BB=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E5=85=A5=E8=AF=A6=E6=83=85=E4=B9=9F=E6=B2=A1?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/standard/controller/LawsEnterpriseController.java | 6 ++++++ .../laws/standard/controller/LawsOverseasController.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index b246d2e8..20e7b857 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -12,6 +12,7 @@ import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRmrEvaluateDetail; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService; @@ -76,6 +77,9 @@ public class LawsEnterpriseController { @Resource private ISarFileCompareInfoService compareInfoService; + @Resource + private ILawsCustomCompareInfoService customCompareService; + private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @AutoLog(value = "企业法规标准-分页列表查询") @@ -185,6 +189,7 @@ public class LawsEnterpriseController { // 删除标准时同步删除比对和拆分的相关数据 splitInfoService.deleteByStandardId((String) parameterMap.get("ids")); compareInfoService.deleteByStandardId((String) parameterMap.get("ids")); + customCompareService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } @@ -202,6 +207,7 @@ public class LawsEnterpriseController { // 删除标准时同步删除比对和拆分的相关数据 splitInfoService.deleteByStandardId((String) parameterMap.get("ids")); compareInfoService.deleteByStandardId((String) parameterMap.get("ids")); + customCompareService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 6c9e5bc0..0ad5ae47 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -11,6 +11,7 @@ import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.service.ILawsCommonService; +import com.jero.modules.laws.customcompare.service.ILawsCustomCompareInfoService; import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; @@ -26,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -53,6 +55,8 @@ public class LawsOverseasController { private ILawsStandardSharingService lawsStandardSharingService; @Autowired private IProcessFbEntryChangeService processFbEntryChangeService; + @Resource + private ILawsCustomCompareInfoService customCompareService; private static final String MODULE_VALUE = TableNameEnum.FOREIGN_REGULATIONS.getValue(); @@ -152,6 +156,7 @@ public class LawsOverseasController { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); + customCompareService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); }