From 83070ae1b6c99bff833b9a43910b58b970037383 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java | 2 --
1 files changed, 0 insertions(+), 2 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..d02cd3f 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;
}
@@ -116,7 +115,6 @@
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;
}
--
Gitblit v1.7.1