From 1736dfcc1c053de7e8f8c5d38e8ebfd0b7bb9ab2 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 20 Nov 2023 09:45:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=2078?=
 =?UTF-8?q?581?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DocumentSplitController.java          |  9 +++++++--
 .../documenttool/service/IDocumentSplitService.java  |  6 ++++++
 .../service/impl/DocumentSplitServiceImpl.java       | 12 +++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
index 61d2bd9e..db90bf78 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -175,7 +176,9 @@ public class DocumentSplitController {
     @RequiresPermissions("split:sarFileSplitInfo:delete")
     public Result<T> delete(@RequestBody Map<String, Object> map) {
         if (map.containsKey("id")) {
-            sarFileSplitInfoService.deleteById((String) map.get("id"));
+            String id = (String) map.get("id");
+            documentSplitService.checkOutOperation(Collections.singletonList(id));
+            sarFileSplitInfoService.deleteById(id);
         }
         return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED));
     }
@@ -192,7 +195,9 @@ public class DocumentSplitController {
     public Result<T> deleteBatch(@RequestBody Map<String, Object> map) {
         if (map.containsKey("ids")) {
             String ids = (String) map.get("ids");
-            sarFileSplitInfoService.deleteByIds(Arrays.asList(ids.split(",")));
+            List<String> list = Arrays.asList(ids.split(","));
+            documentSplitService.checkOutOperation(list);
+            sarFileSplitInfoService.deleteByIds(list);
         }
         return Result.OK(MessageUtils.getMessage(ResultCommon.SUCCESSFULLY_DELETED_IN_BULK));
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
index a8719567..f76e397e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
@@ -42,6 +42,12 @@ public interface IDocumentSplitService {
      */
     void updatePermissions(DocumentSplitInfo documentSplitInfo);
 
+    /**
+     * 判断操作权限
+     * @param ids
+     */
+    void checkOutOperation(List<String> ids);
+
     /**
      * 文档拆分详情-分页列表查询
      * @param parameter
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 3d35c698..6988aea3 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -176,8 +176,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             List<DocumentSplitInfo> documentSplitInfos = queryByList(documentSplitInfo);
             ids = documentSplitInfos.stream().map(DocumentSplitInfo::getId).collect(Collectors.toList());
         }
-        // 校验权限
-        checkOut(ids);
+
+        // 判断操作权限
+        checkOutOperation(ids);
 
         updateWrapper.in(SarFileSplitInfoEO::getId, ids);
         SysUser sysUser = sysUserService.getById(documentSplitInfo.getCreateBy());
@@ -186,7 +187,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         sarFileSplitInfoService.update(updateWrapper);
     }
 
-    private void checkOut(List<String> ids) {
+    /**
+     * 判断操作权限
+     * @param ids
+     */
+    @Override
+    public void checkOutOperation(List<String> ids) {
         // 登陆人信息
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         if (sysUser.getRoleIds().contains("admin")){