From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java | 14 ++++++++++++--
1 files changed, 12 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 2fe013e..6dc137d 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
@@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 部门控制器
@@ -81,6 +82,7 @@
@ResponseBody
public List<ZTreeNode> tree() {
List<ZTreeNode> tree = this.deptService.tree();
+
tree.add(ZTreeNode.createParent());
return tree;
}
@@ -98,8 +100,9 @@
}
//完善pids,根据pid拿到pid的pids
deptSetPids(dept);
-
-
+ dept.setObjectType(UserExt.getUser().getObjectType());
+ dept.setObjectId(UserExt.getUser().getObjectId());
+ dept.setVersion(UserExt.getUser().getId());
return this.deptService.save(dept);
}
@@ -111,6 +114,13 @@
@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