From 9acf2a4d900ccff01c600cf0b4cf4f86711e3031 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, 8 Nov 2023 16:02:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/controller/LawsWorkingGroupController.java   | 5 ++++-
 .../java/com/jero/modules/sys/entity/LawsWorkingGroup.java   | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java
index f46273c7..5cc3672b 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupController.java
@@ -47,7 +47,7 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
 	@GetMapping(value = "/list")
 	public Result<List<LawsWorkingGroup>> queryList(LawsWorkingGroup lawsWorkingGroup) {
         List<LawsWorkingGroup> list = lawsWorkingGroupService.queryList();
-		List<LawsWorkingGroup> toTree = new ArrayList<>();
+		List<LawsWorkingGroup> toTree;
         if (StringUtils.isBlank(lawsWorkingGroup.getName())){
 			toTree = lawsWorkingGroupService.convertToTree(list);
 		}else {
@@ -85,6 +85,9 @@ public class LawsWorkingGroupController extends JeroController<LawsWorkingGroup,
 		String pid = lawsWorkingGroup.getPid();
 		if (StringUtils.isNotBlank(pid)){
 			LawsWorkingGroup workingGroup = lawsWorkingGroupService.queryById(pid);
+			if(workingGroup.getLevel() == 1 && StringUtils.isBlank(lawsWorkingGroup.getUserId())){
+				throw new JeroBootException("管理权限不能为空");
+			}
 			lawsWorkingGroup.setLevel(workingGroup.getLevel() + 1);
 		}else {
 			lawsWorkingGroup.setLevel(1);
diff --git a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java
index a395ec2a..07bc5616 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/entity/LawsWorkingGroup.java
@@ -45,6 +45,10 @@ public class LawsWorkingGroup implements Serializable {
     @ApiModelProperty(value = "层级")
     private Integer level;
 
+    /**管理权限(只有分会层级配置)*/
+    @ApiModelProperty(value = "管理权限(只有分会层级配置)")
+    private String userId;
+
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;