From 845e2b35abcf93ab620fca78be3272af3751d235 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Tue, 13 May 2025 17:22:20 +0800
Subject: [PATCH] bug

---
 .../src/main/java/com/zdxt/domain/auth/Role.java  | 15 +++++++++++++++
 .../system/dept/service/DeptServiceImpl.java      | 14 ++++++++++++--
 .../templates/system/role/dataScope.html          |  6 ++++--
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java
index f13cf767..76470e44 100644
--- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java
+++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java
@@ -7,6 +7,8 @@ import com.zdxt.common.annotation.Excel;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.List;
+
 /**
  * 角色表 sys_role
  * 
@@ -62,6 +64,11 @@ public class Role extends BaseDomain
     private String roleCode;
     private String isRoleSys;
 
+    /**
+     * 角色左侧树状图区分
+     */
+    private List<Integer> zoneList;
+
     public String getTenantCode() {
         return tenantCode;
     }
@@ -244,4 +251,12 @@ public class Role extends BaseDomain
             .append("remark", getRemark())
             .toString();
     }
+
+    public List<Integer> getZoneList() {
+        return zoneList;
+    }
+
+    public void setZoneList(List<Integer> zoneList) {
+        this.zoneList = zoneList;
+    }
 }
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
index 78573589..68d5c1f4 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/service/DeptServiceImpl.java
@@ -141,6 +141,11 @@ public class DeptServiceImpl implements IDeptService
     {
         List<Dept> deptList = deptMapper.selectDeptList(dept);
         List<Ztree> ztrees = initZtree(deptList);
+        ztrees = getZtrees(ztrees);
+        return ztrees;
+    }
+
+    private List<Ztree> getZtrees(List<Ztree> ztrees) {
         if (CollectionUtils.isNotEmpty(ztrees)) {
             //拿到深圳市
             Ztree ztree = new Ztree();
@@ -194,9 +199,9 @@ public class DeptServiceImpl implements IDeptService
                 }
             }
         }
-
         return ztrees;
     }
+
     @Override
     public List<Ztree> selectDeptTreeNotRole(Dept dept)
     {
@@ -216,7 +221,9 @@ public class DeptServiceImpl implements IDeptService
     {
         Long roleId = role.getRoleId();
         List<Ztree> ztrees = new ArrayList<Ztree>();
-        List<Dept> deptList = selectDeptList(new Dept());
+        Dept dept = new Dept();
+        dept.setZoneList(role.getZoneList());
+        List<Dept> deptList = selectDeptList(dept);
         if (StringUtils.isNotNull(roleId))
         {
             List<String> roleDeptList = deptMapper.selectRoleDeptTree(roleId);
@@ -226,6 +233,9 @@ public class DeptServiceImpl implements IDeptService
         {
             ztrees = initZtree(deptList);
         }
+        if (CollectionUtils.isNotEmpty(role.getZoneList())) {
+            ztrees = getZtrees(ztrees);
+        }
         return ztrees;
     }
 
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/dataScope.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/dataScope.html
index 35cfcabb..76a9b3a1 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/dataScope.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/dataScope.html
@@ -45,9 +45,11 @@
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: ztree-js" />
 	<script type="text/javascript">
-	
+
+		// var url = ctx + "system/dept/treeData?roleId=" + $("#roleId").val()+"&zoneList="+list;
 	    $(function() {
-			var url = ctx + "system/dept/roleDeptTreeData?roleId=" + $("#roleId").val();
+			var list = [1,2,3,4];
+			var url = ctx + "system/dept/roleDeptTreeData?roleId=" + $("#roleId").val()+"&zoneList="+list;;
 			var options = {
 				id: "deptTrees",
 		        url: url,