From 7bacb4be65407d9f8a6bdcd44b4192aa32de91a1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 20 七月 2023 10:06:22 +0800
Subject: [PATCH] 提交代码

---
 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