From 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:59:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/DeptController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..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;
/**
* 部门控制器
@@ -101,7 +102,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 +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