From 0278eb61345eec52649d52c2241a78526a9f81fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 12 Nov 2024 10:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=98=E5=B7=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/UserRoleMapper.xml  | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
index 2ce71a7e..db308a53 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/UserRoleMapper.xml
@@ -20,21 +20,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				  AND sur.role_id = ( SELECT id FROM system_role WHERE `code` = #{roleCode} ))
 	</select>
 	<select id="selectListByRoleId" resultType="cn.iocoder.yudao.module.system.api.user.dto.UserDTO"
-			parameterType="cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO">
-		select su.*
-		from system_user_role sr
-				 left join system_users su on sr.user_id = su.id
-		left join system_role sr2 on sr.role_id = sr2.id
-		<where>
-			su.deleted = 0 and sr2.service_package_id = 'jiance'
-			<if test="role.roleId != null">
-				and sr.role_id = #{role.roleId}
-			</if>
-			<if test="role.nickname != null">
-				and su.nickname like CONCAT('%',#{role.nickname},'%')
-			</if>
-		</where>
-	</select>
+        parameterType="cn.iocoder.yudao.module.system.controller.admin.permission.vo.role.RolePageReqVO">
+    select distinct su.*
+    from system_users su
+    left join system_user_role sr on su.id = sr.user_id
+    left join system_role sr2 on sr.role_id = sr2.id
+    <where>
+        su.deleted = 0 and sr2.service_package_id = 'jiance'
+        <if test="role.roleId != null">
+            and sr.role_id = #{role.roleId}
+        </if>
+        <if test="role.nickname != null">
+            and su.nickname like CONCAT('%',#{role.nickname},'%')
+        </if>
+    </where>
+</select>
+
+
 	<select id="selectByRoleId" resultType="cn.iocoder.yudao.module.system.api.user.dto.UserDTO">
 		SELECT
 			*