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 impl */ @Override public List listUser(UserDTO userDTO) { + String hosptital = sysHospitalService.getCurrentHospital(); + if (StringUtils.hasText(hosptital) && !"null".equals(hosptital)) { + userDTO.setHospitalId(Long.valueOf(hosptital)); + } // 根据数据权限查询全部的用户信息 List 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 - u.del_flag = '0' + u.del_flag = '0' and u.user_id != '1' AND u.username LIKE #{usernameLike} @@ -201,6 +201,10 @@ AND u.dept_id = #{query.deptId} + + + and u.hospital_id = #{query.hospitalId} +