From 241baa84b628b01e485e07b13fd5bf8eba1eb623 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 11 Oct 2023 14:03:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=B2=E6=94=B6=E5=88=86=E4=BA=AB):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LawsStandardSharingController.java        | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 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 43289404..580bdd2e 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
@@ -1,39 +1,40 @@
 package com.jero.modules.personal.controller;
 
-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.CommonConstant;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.ResultCommon;
+import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.entity.LawsNewsFeed;
-import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
-import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.laws.standard.service.ILawsNewsFeedService;
 import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
 import com.jero.modules.personal.entity.LawsStandardSharing;
 import com.jero.modules.personal.service.ILawsStandardSharingService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import com.jero.common.system.base.controller.JeroController;
+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.RequiresPermissions;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.jero.common.aspect.annotation.AutoLog;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
 
 
 /**
@@ -238,12 +239,18 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
     }
 
     /**
-     * 批量删除
+     * 批量删除(已发分享)
      */
-    @AutoLog(value = "标准分享-批量删除")
-    @ApiOperation(value = "标准分享-批量删除", notes = "标准分享-批量删除")
+    @AutoLog(value = "标准分享-批量删除(已发分享)")
+    @ApiOperation(value = "标准分享-批量删除(已发分享)", notes = "标准分享-批量删除(已发分享)")
     @PostMapping(value = "/deleteBatch")
+    @RequiresPermissions(value = "personalCenter:sentShare:batchDel")
     public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
+        return judge(map);
+    }
+
+    @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);
         }
@@ -251,4 +258,14 @@ public class LawsStandardSharingController extends JeroController<LawsStandardSh
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
+    /**
+     * 批量删除(已收分享)
+     */
+    @AutoLog(value = "标准分享-批量删除(已收分享)")
+    @ApiOperation(value = "标准分享-批量删除(已收分享)", notes = "标准分享-批量删除(已收分享)")
+    @PostMapping(value = "/batchDel")
+    @RequiresPermissions(value = "personalCenter:receivedShare:batchDel")
+    public Result<T> batchDel(@RequestBody Map<String, String> map) {
+        return judge(map);
+    }
 }