From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java
index 6dc137d..8885e58 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java
@@ -82,7 +82,6 @@
@ResponseBody
public List<ZTreeNode> tree() {
List<ZTreeNode> tree = this.deptService.tree();
-
tree.add(ZTreeNode.createParent());
return tree;
}
@@ -114,13 +113,6 @@
@ResponseBody
public Object list(String condition) {
List<Map<String, Object>> list = this.deptService.list(condition);
- if (UserExt.getUser().getObjectType()==2){
- List<Map<String, Object>> filteredRoles = list.stream()
- .filter(role -> role.containsKey("version") && role.get("version").equals(1))
- .collect(Collectors.toList());
- return filteredRoles;
- }
-
return super.warpObject(new DeptWarpper(list));
}
--
Gitblit v1.7.1