From c2f604cbc73a590df2f8f3c821f00aaef90bc40b Mon Sep 17 00:00:00 2001 From: yanyan Date: Mon, 28 Jul 2025 17:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dept/service/DeptServiceImpl.java | 15 +++++++++------ .../resources/templates/system/role/roleNew.html | 2 +- .../resources/templates/system/user/edit.html | 2 +- .../resources/templates/system/user/user.html | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) 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 ff729ad6..ce8abebf 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 @@ -176,15 +176,15 @@ public class DeptServiceImpl implements IDeptService ztrees = ztrees.stream() .peek(i -> i.setpId(Objects.equals(i.getZone(), 1) || Objects.equals(i.getZone(), 2) ? String.valueOf(i.getZone()) : i.getpId())) - .peek(i -> i.setpId(Objects.equals(i.getZone(), 15) ? "1" : i.getpId())) + .peek(i -> i.setpId((Objects.equals(i.getZone(), 15)||Objects.equals(i.getZone(), 16)) ? "1" : i.getpId())) .collect(Collectors.toList()); Map map = ztrees.stream() .filter(item -> Objects.equals(item.getZone(), 2)) .collect(Collectors.toMap(Ztree::getId, Ztree::getName)); - List collect = ztrees.stream() - .filter(item -> Objects.equals(item.getZone(), 2)) + List checkDept = ztrees.stream() + .filter(item -> (Objects.equals(item.getZone(), 3)||Objects.equals(item.getZone(), 5)||Objects.equals(item.getZone(), 6))) .map(Ztree::getId).collect(Collectors.toList()); List finalZtrees = ztrees; map.forEach((pid, value)->{ @@ -197,11 +197,14 @@ public class DeptServiceImpl implements IDeptService finalZtrees.add(ztree1); //给所有区下面的部门 挂到区-区直下 for (Ztree ztree2 : finalZtrees) { - if (Objects.equals(ztree2.getZone(), 3)) { - if(StringUtils.isNotEmpty(ztree2.getAncestors()) && ztree2.getAncestors().contains(pid)) { + //zone为3是区直类型 zone为6是消防类的区直 zone为6是公安类的区直 + if (Objects.equals(ztree2.getZone(), 3) || Objects.equals(ztree2.getZone(), 6) || Objects.equals(ztree2.getZone(), 5)) { + if (checkDept.contains(ztree2.getpId())) { + // + } else if(StringUtils.isNotEmpty(ztree2.getAncestors()) && ztree2.getAncestors().contains(pid)) { ztree2.setpId(ztree1.getId()); }else if (StringUtils.isEmpty(ztree2.getAncestors()) - || collect.stream().noneMatch(i -> ztree2.getAncestors().contains(i))) { + || map.values().stream().noneMatch(i -> ztree2.getAncestors().contains(i))) { if (ztree2.getName().contains(value.substring(0,2))) { ztree2.setpId(ztree1.getId()); } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html index b6ee1ab0..77eaf2d5 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html @@ -195,7 +195,7 @@ function queryDeptTree() { - var list = [1,2,3,4,15]; + var list = [1,2,3,4,5,6,16,15]; var url = ctx + "system/dept/treeData?zoneList="+list; var options = { url: url, diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html index b7c6fca6..92844742 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/edit.html @@ -208,7 +208,7 @@ /*用户管理-修改-选择部门树*/ function selectDeptTree() { var deptId = $.common.isEmpty($("#treeId").val()) ? "100" : $("#treeId").val(); - var list = [1,2,3,4,15]; + var list = [1,2,3,4,5,6,16,15]; var url = ctx + "system/dept/treeData?zoneList="+list; //var url = ctx + "system/dept/selectDeptTree/" + deptId; var options = { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html index 0bc5971c..1795036c 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html @@ -242,7 +242,7 @@ function queryDeptTree() { //var url = ctx + "system/dept/treeData"; - var list = [1,2,3,4,15]; + var list = [1,2,3,4,5,6,16,15]; var url = ctx + "system/dept/treeData?zoneList="+list; var options = { url: url,