From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/resources/mapper/system/UserMapper.xml |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/resources/mapper/system/UserMapper.xml b/rsf-server/src/main/resources/mapper/system/UserMapper.xml
index b469199..fd60018 100644
--- a/rsf-server/src/main/resources/mapper/system/UserMapper.xml
+++ b/rsf-server/src/main/resources/mapper/system/UserMapper.xml
@@ -4,14 +4,10 @@
 
     <select id="selectPageRel" resultType="com.vincent.rsf.server.system.entity.User">
         select
-        su.*
+        DISTINCT su.*
         from sys_user su
         left join sys_dept sd on su.dept_id = sd.id
-        left join (
-            select *
-            from sys_user_role sur
-            group by sur.user_id
-        ) sur on sur.user_id = su.id
+        left join sys_user_role sur on sur.user_id = su.id
         where 1=1
         and su.deleted = 0
 

--
Gitblit v1.9.1