From f1617554c99676350df2ce3c7f61353aff5776e6 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 5 Feb 2024 14:54:39 +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

---
 .../service/ILawsCustomCompareInfoService.java     |  6 ++++++
 .../impl/LawsCustomCompareInfoServiceImpl.java     | 14 ++++++++++++++
 .../controller/LawsDomesticController.java         |  5 +++++
 3 files changed, 25 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java
index 92b8147e..41734ac3 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/ILawsCustomCompareInfoService.java
@@ -125,5 +125,11 @@ public interface ILawsCustomCompareInfoService extends IService<LawsCustomCompar
      * @param listName
      */
     void uniqueVerify(String id, String listName);
+
+    /**
+     * 标准删除时
+     * @param ids
+     */
+    void deleteByStandardId(String ids);
 }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
index 331dc3c7..b575fdd5 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/customcompare/service/impl/LawsCustomCompareInfoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.laws.customcompare.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -498,6 +499,19 @@ public class LawsCustomCompareInfoServiceImpl extends ServiceImpl<LawsCustomComp
         }
     }
 
+    @Override
+    public void deleteByStandardId(String ids) {
+        if (StrUtil.isBlank(ids)) {
+            return;
+        }
+        LambdaQueryWrapper<LawsCustomCompareInfoStandard> ccsWrapper = new LambdaQueryWrapper<>();
+        ccsWrapper.in(LawsCustomCompareInfoStandard::getStandardId, Arrays.asList(ids.split(",")));
+        List<LawsCustomCompareInfoStandard> list = lawsCustomCompareInfoStandardService.list(ccsWrapper);
+        Set<String> infoIdsSet = new HashSet<>();
+        list.forEach(i -> infoIdsSet.add(i.getInfoId()));
+        removeByIds(infoIdsSet);
+    }
+
     private void createTableCellContent(HSSFSheet sheet, List<StandardVO> standardVOS, List<LawsCustomCompareInventory> featureList, List<LawsCustomCompareInventory> compareList, List<LawsCustomCompareCell> list, CellStyle cellStyle) {
         for (int i = 2; i <= compareList.size() + 2; i++) {
             // 创建行
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
index a221cc64..72a3e763 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
@@ -12,6 +12,7 @@ import com.jero.modules.activiti.process.fb.service.IProcessFbEntryChangeService
 import com.jero.modules.compare.service.ISarFileCompareInfoService;
 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;
@@ -63,6 +64,9 @@ public class LawsDomesticController {
     @Resource
     private ISarFileCompareInfoService compareInfoService;
 
+    @Resource
+    private ILawsCustomCompareInfoService customCompareService;
+
     private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue();
 
     @AutoLog(value = "国内法规标准-分页列表查询")
@@ -164,6 +168,7 @@ public class LawsDomesticController {
         // 删除标准时同步删除比对和拆分的相关数据
         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));
     }