From e7f23c16b1d1c6553a0442f3d0d129248d267670 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:57:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 08b41c6..5909863 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -509,6 +509,11 @@
@Override
public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser1 = this.getById(userid);
+ if(sysUser1.getRoleType() == 2){
+ getSysUserList.setObjectId(sysUser1.getObjectId());
+ }
List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
for (SysUser sysUser : list) {
List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
@@ -541,6 +546,11 @@
@Override
public PageInfo<SysUser> getChangeUserList(ChangeUserQuery query) {
+ Long userid = tokenService.getLoginUser().getUserid();
+ SysUser sysUser1 = this.getById(userid);
+ if(sysUser1.getRoleType() == 2){
+ query.setObjectId(sysUser1.getObjectId());
+ }
PageInfo<SysUser> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
List<SysUser> list = this.baseMapper.getChangeUserList(pageInfo, query);
return pageInfo.setRecords(list);
--
Gitblit v1.7.1