From 542e3942a1852c67150de4d4d0bcdab6a55a4cc5 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 23 Aug 2024 11:23:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=86=85=E9=83=A8=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E9=A2=86=E5=AF=BC=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=8D=E9=99=90=E5=88=B6=E6=93=8D=E4=BD=9C=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsWorkingGroupUserController.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
index 35272f59..623bce05 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
@@ -103,8 +103,10 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     @ApiOperation(value = "内部工作组人员关联表-添加", notes = "内部工作组人员关联表-添加")
     @PostMapping(value = "/add")
     public Result<T> add(@Validated @RequestBody LawsWorkingGroupUser lawsWorkingGroupUser) {
-        if (StringUtils.isBlank(lawsWorkingGroupUser.getWorkingGroupId()) || StringUtils.isBlank(lawsWorkingGroupUser.getUserId())) {
-            throw new JeroBootException(ResultCommon.PLEASE_SELECT_PERSONNEL_AND_WORKGROUP);
+        if (!"1".equals(lawsWorkingGroupUser.getSearchType())) {
+            if (StringUtils.isBlank(lawsWorkingGroupUser.getWorkingGroupId()) || StringUtils.isBlank(lawsWorkingGroupUser.getUserId())) {
+                throw new JeroBootException(ResultCommon.PLEASE_SELECT_PERSONNEL_AND_WORKGROUP);
+            }
         }
         // 校验是否有权限
         lawsWorkingGroupUserService.checkAuth(lawsWorkingGroupUser.getWorkingGroupId());
@@ -150,6 +152,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     @ApiOperation(value = "内部工作组人员关联表-通过id删除", notes = "内部工作组人员关联表-通过id删除")
     @PostMapping(value = "/delete")
     public Result<T> delete(@RequestBody Map<String, String> map) {
+        String searchType = map.get("searchType");
         if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) {
             throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA);
         }
@@ -158,7 +161,9 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
         // 校验是否有权限
-        lawsWorkingGroupUserService.checkAuth(lawsWorkingGroupUser.getWorkingGroupId());
+        if (!"1".equals(searchType)) {
+            lawsWorkingGroupUserService.checkAuth(lawsWorkingGroupUser.getWorkingGroupId());
+        }
         lawsWorkingGroupUserService.deleteById(map.get("id"));
         return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }