From a20dad0f0702e192bee8b80c6237a0e9bb7d8b66 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 09 一月 2026 17:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java | 2 +-
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 5 +++--
src/main/resources/mapper/system/SysUserMapper.xml | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 3fb2b5d..b2f5725 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -145,6 +145,7 @@
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
user.setCreateBy(getUsername());
+ user.setTenantId(SecurityUtils.getLoginUser().getTenantId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
}
@@ -279,8 +280,8 @@
@GetMapping("/userListNoPageByTenantId")
public AjaxResult userListNoPageByTenantId(SysUser user){
//鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- user.setTenantId(loginUser.getTenantId());
+// SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ user.setTenantId(SecurityUtils.getLoginUser().getTenantId());
List<SysUser> sysUserList = userService.userListNoPage(user);
return AjaxResult.success(sysUserList);
}
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
index 6bb8927..f547d54 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java
@@ -72,7 +72,7 @@
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
+ @DataScope(tenantIdFelid = "u")
public List<SysUser> selectUserList(SysUser user)
{
return userMapper.selectUserList(user);
diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index f77e62c..f457611 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -57,7 +57,7 @@
<select id="selectUserList" parameterType="com.ruoyi.project.system.domain.SysUser" resultMap="SysUserResult">
select u.user_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,T2.dept_names from sys_user u
- left join
+ inner join
( SELECT T1.user_id,GROUP_CONCAT(T2.dept_name SEPARATOR ', ') AS dept_names
FROM
sys_user_dept T1
--
Gitblit v1.9.3