From 51e1d9cc6dddfb641bde86a8cb7bfd2ef8b104d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 4 Jul 2024 20:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=B8=85=E5=8D=95=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MarketStandardController.java  |  8 +++----
 .../service/ILawsMarketStandardService.java   |  2 +-
 .../impl/LawsMarketStandardServiceImpl.java   | 24 +++++++++++++++----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
index e55b901f..11f9c91a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java
@@ -93,16 +93,16 @@ public class MarketStandardController {
      * @param map
      * @return
      */
-    @AutoLog(value = "外部标准库-市场法规清单-批量删除")
-    @ApiOperation(value = "外部标准库-市场法规清单-批量删除", notes = "外部标准库-市场法规清单-批量删除")
+    @AutoLog(value = "外部标准库-市场法规清单-删除")
+    @ApiOperation(value = "外部标准库-市场法规清单-删除", notes = "外部标准库-市场法规清单-删除")
     @ApiOperationSupport(order = 4)
     @PostMapping(value = "/delete")
-    @RequiresPermissions("marketStandard:delete")
+    @RequiresPermissions("marketStandard:deleteBatch")
     public Result<T> delete(@RequestBody Map<String, String> map) {
         if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
             return Result.error("请选择数据!");
         }
-        this.marketStandardService.deleteById(Arrays.asList(map.get("id").split(",")));
+        this.marketStandardService.deleteById(map.get("id"));
         return Result.OK("批量删除成功!");
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java
index 449288fb..8cb8631b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java
@@ -23,7 +23,7 @@ public interface ILawsMarketStandardService extends IService<LawsMarketStandard>
      * 删除
      * @param ids
      */
-    void deleteById(List<String> ids);
+    void deleteById(String id);
 
     /**
      * 批量删除
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
index 36165368..4177d3e0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java
@@ -224,14 +224,28 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     }
 
     @Override
-    public void deleteById(List<String> ids) {
+    public void deleteById(String id) {
+        LawsMarketStandard lawsMarketStandard = getById(id);
+        if(Objects.isNull(lawsMarketStandard)){
+            throw new JeroBootException("数据不存在");
+        }
+        // 获取不同版本的数据
         LambdaQueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new LambdaQueryWrapper<>();
-//        list()
-        removeByIds(ids);
+        queryLawsMarketStandard.select(LawsMarketStandard::getId);
+        queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag());
+        List<LawsMarketStandard> listLawsMarketStandard = list(queryLawsMarketStandard);
+        if(CollectionUtils.isEmpty(listLawsMarketStandard)){
+            throw new JeroBootException("数据不存在");
+        }
+        // 删除版本标识下所有数据
+        LambdaUpdateWrapper<LawsMarketStandard> updateLawsMarketStandard = new LambdaUpdateWrapper<>();
+        updateLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag());
+        remove(updateLawsMarketStandard);
+        // 删除详情列表数据
+        List<String> listIds = listLawsMarketStandard.stream().map(LawsMarketStandard::getId).collect(Collectors.toList());
         LambdaQueryWrapper<LawsMarketStandardDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(LawsMarketStandardDetail::getManifestId, ids);
+        wrapper.in(LawsMarketStandardDetail::getManifestId, listIds);
         lawsMarketStandardDetailService.remove(wrapper);
-
     }
 
     @Override