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 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 delete(@RequestBody Map 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