From 56adadb7b67b3491e249971ab926d3282bcbddcf Mon Sep 17 00:00:00 2001
From: yy <2@2.com>
Date: Mon, 3 Jun 2024 10:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=A0=B9=E6=8D=AE=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=8C=BB=E9=99=A2id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/rax/admin/service/impl/SysUserServiceImpl.java | 4 ++++
 upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml   | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java
index ab9450e..9ac4882 100644
--- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java
+++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysUserServiceImpl.java
@@ -276,6 +276,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	 */
 	@Override
 	public List<UserExcelVO> listUser(UserDTO userDTO) {
+		String hosptital = sysHospitalService.getCurrentHospital();
+		if (StringUtils.hasText(hosptital) && !"null".equals(hosptital)) {
+			userDTO.setHospitalId(Long.valueOf(hosptital));
+		}
 		// 根据数据权限查询全部的用户信息
 		List<UserVO> voList = baseMapper.selectVoList(userDTO);
 		// 转换成execl 对象输出
diff --git a/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml
index 43216ce..e77bf44 100644
--- a/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/upms/upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -193,7 +193,7 @@
 		FROM sys_user u
 				 LEFT JOIN sys_dept d ON d.dept_id = u.dept_id
 		<where>
-			u.del_flag = '0'
+			u.del_flag = '0' and u.user_id != '1'
 			<if test="query.username != null and query.username != ''">
 				<bind name="usernameLike" value="'%' + query.username + '%'"/>
 				AND u.username LIKE #{usernameLike}
@@ -201,6 +201,10 @@
 			<if test="query.deptId != null and query.deptId != ''">
 				AND u.dept_id = #{query.deptId}
 			</if>
+
+			<if test="query.hospitalId != null and query.hospitalId != ''">
+				and u.hospital_id = #{query.hospitalId}
+			</if>
 		</where>
 
 		<if test="_databaseId != 'mssql'">