From 35c6448c1d4a3701e37da7895f2b98768c5f8a2f Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 20 七月 2023 15:38:13 +0800
Subject: [PATCH] 1、处理了map空对象转换为字符串“null”问题
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 6244112..bd7e58d 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -173,6 +173,13 @@
List<User> users = baseMapper.selectUserPage(user, deptIdList, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
return users;
}
+ @Override
+ public List<User> selectAllUser(){
+ LambdaQueryWrapper<User> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(User::getIsDeleted,0);
+ List<User> users = baseMapper.selectList(wrapper);
+ return users;
+ }
@Override
public IPage<UserVO> selectUserSearch(UserVO user, Query query) {
@@ -244,6 +251,7 @@
if (ObjectUtil.isEmpty(user)) {
return null;
}
+ user.setDeptName(Func.join(SysCache.getDeptNames(user.getDeptId())));
UserInfo userInfo = new UserInfo();
userInfo.setUser(user);
if (Func.isNotEmpty(user)) {
--
Gitblit v1.9.3