From e2a5eca975319406a8980757cb347b774de2c18d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 31 Jan 2024 16:00:02 +0800
Subject: [PATCH] fix:78578

---
 .../LawsStandardSharingController.java        | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
index c94dc094..a65193f1 100644
--- a/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
+++ b/laws-modules/src/main/java/com/jero/modules/personal/controller/LawsStandardSharingController.java
@@ -34,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -252,7 +253,7 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
     @ApiOperation(value = "标准分享-动态消息分享", notes = "标准分享-动态消息分享")
     @PostMapping(value = "/dynamicMessages/add")
     @ApiOperationSupport(order = 6)
-    @RequiresPermissions("dynamicMessage:share")
+    @RequiresPermissions(value = { "dynamicMessage:share", "dynamicMessage:search" }, logical = Logical.AND)
     public Result<T> dynamicMessages(@RequestBody LawsStandardSharing lawsStandardSharing) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         SysUser user = sysUserService.getById(sysUser.getId());
@@ -262,6 +263,8 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
         if (0 == lawsNewsFeed.getReleaseStatus()) {
             throw new JeroBootException("未发布的消息不能进行分享");
         }
+
+
         List<LawsStandardSharing> sharings = new ArrayList<>();
         List<String> recipientIdList = Arrays.asList(recipientId.split(","));
         for (int i = 0; i < recipientIdList.size(); i++) {
@@ -294,15 +297,6 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
     @RequiresPermissions(value = "personalCenter:sentShare:batchDel")
     @ApiOperationSupport(order = 7)
     public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
-        return judge(map);
-    }
-
-    // TODO 放到service里
-    @NotNull
-    private Result<T> judge(@RequestBody Map<String, String> map) {
-        if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
-            throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
-        }
         List<String> listIds = Arrays.asList(map.get("ids").split(","));
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LambdaQueryWrapper<LawsStandardSharing> queryLawsStandardSharing = new LambdaQueryWrapper<>();
@@ -312,7 +306,15 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
         if(l > 0){
             throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION);
         }
+        return judge(map);
+    }
 
+    // TODO 放到service里
+    @NotNull
+    private Result<T> judge(@RequestBody Map<String, String> map) {
+        if (!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))) {
+            throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
+        }
         this.lawsStandardSharingService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
@@ -326,6 +328,15 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
     @RequiresPermissions(value = "personalCenter:receivedShare:batchDel")
     @ApiOperationSupport(order = 8)
     public Result<T> batchDel(@RequestBody Map<String, String> map) {
+        List<String> listIds = Arrays.asList(map.get("ids").split(","));
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        LambdaQueryWrapper<LawsStandardSharing> queryLawsStandardSharing = new LambdaQueryWrapper<>();
+        queryLawsStandardSharing.in(LawsStandardSharing::getId,listIds);
+        queryLawsStandardSharing.ne(LawsStandardSharing::getRecipientId,sysUser.getId());
+        long l = lawsStandardSharingService.count(queryLawsStandardSharing);
+        if(l > 0){
+            throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION);
+        }
         return judge(map);
     }
 }