From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java | 10 ++++++++--
1 files changed, 8 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 fe588af..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
@@ -25,6 +25,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 部门控制器
@@ -81,7 +82,6 @@
@ResponseBody
public List<ZTreeNode> tree() {
List<ZTreeNode> tree = this.deptService.tree();
-
tree.add(ZTreeNode.createParent());
return tree;
}
@@ -101,7 +101,7 @@
deptSetPids(dept);
dept.setObjectType(UserExt.getUser().getObjectType());
dept.setObjectId(UserExt.getUser().getObjectId());
-
+ dept.setVersion(UserExt.getUser().getId());
return this.deptService.save(dept);
}
@@ -113,6 +113,12 @@
@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()
+ .collect(Collectors.toList());
+ return filteredRoles;
+ }
+
return super.warpObject(new DeptWarpper(list));
}
--
Gitblit v1.7.1