From 4b04e7fd4fcad9af480a003509288aa6070b137e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期日, 04 二月 2024 13:51:45 +0800
Subject: [PATCH] 修改
---
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 48 +++++++++++++-----------------------------------
1 files changed, 13 insertions(+), 35 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
index 9149cc0..1c2ecc2 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
@@ -262,43 +262,11 @@
Map<String, Object> sysUser = new Hashtable();
sysUser.put("isAdmin", false);
- sysUser.put("isTyRole", false);
- sysUser.put("isYwzRole", false);
- sysUser.put("isTzRole", false);
sysUser.put("isAssistant", false);
- sysUser.put("isCzRole", false);
- sysUser.put("isBzRole", false);
- sysUser.put("isCjRole", false);
- sysUser.put("isZcRole", false);
List<RoleDto> roles = sysRoleUserService.getUserRoles(UserContext.getUser().getId());
if (roles != null && roles.size() > 0) {
if (roles.stream().filter(p -> p.getCode().equals("xtglybm") || p.getCode().equals("all")).count() > 0) {
sysUser.put("isAdmin", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("tybm")).count() > 0) {
- sysUser.put("isTyRole", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("ywzbm")).count() > 0) {
- sysUser.put("isYwzRole", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("tzbm")).count() > 0) {
- sysUser.put("isTzRole", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("zlbm")).count() > 0) {
- sysUser.put("isAssistant", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("czbm")).count() > 0) {
- sysUser.put("isCzRole", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("bzbm")).count() > 0) {
- sysUser.put("isBzRole", true);
- }
-
- if (roles.stream().filter(p -> p.getCode().equals("cjbm") || p.getCode().equals("zcbm")).count() > 0) {
- sysUser.put("isCjRole", true);
- }
- if (roles.stream().filter(p -> p.getCode().equals("zcbm")).count() > 0) {
- sysUser.put("isZcRole", true);
}
}
return sysUser;
@@ -331,14 +299,24 @@
return num;
}
- public List<SysUser> getUsersList() {
- return baseDao.getUsersList();
+ public List<SysUser> getUsersList(String type, String deptId) {
+ List<SysUser> list = baseDao.getUsersList(type,deptId);
+ return list;
}
- public String getUsersName(Long id) {
+ public String getUsersName(String id) {
return baseDao.getUsersName(id);
}
+ public String getNames(String ids) {
+ String[] NamesData = ids.split(",");
+ List<String> nameList =new ArrayList<>();
+ for (String item : NamesData) {
+ nameList.add(this.getUsersName(item));
+ }
+ String names = String.join(", ", nameList);
+ return names;
+ }
public SysUser getUserInfo(Long id) {
SysUser data = super.get(id);
if (data != null) {
--
Gitblit v1.9.1