From 95985b5a5bb7c5656098cc8923ed3d1d8aaa3d2b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 24 一月 2025 10:44:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index c0b58fa..7336905 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -137,7 +137,7 @@
 		left join sys_user_role ur on u.user_id = ur.user_id
 		left join sys_role sr on ur.role_id = sr.role_id
 		left join sys_dept sd on u.dept_id = sd.dept_id
-		where u.user_id = #{userId} and u.del_flag = 0 group by u.user_id
+		where u.user_id = #{userId} and u.del_flag = 0
 	</select>
 	
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">

--
Gitblit v1.7.1