From 9fedbcaa64675d6e8831dbb8b2cdf8f76aa8fa4e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 25 Apr 2025 18:47:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=8C=89=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20user.roleCodes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mappings/modules/sys/EmpUserDao.xml    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
index bad1c37f..eedbe2e5 100644
--- a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
+++ b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
@@ -13,7 +13,7 @@
 	<select id="findList" resultType="EmpUser">
 		SELECT ${sqlMap.column.toSql()}
 		FROM ${sqlMap.table.toSql()}
-		<if test="roleCode != null and roleCode != ''">
+		<if test="(roleCode != null and roleCode != '') or (roleCodes != null and roleCodes.length gt 0)">
 			JOIN ${_prefix}sys_user_role ur2 ON ur2.user_code = a.user_code
 		</if>
 		<if test="employee.postCode != null and employee.postCode != ''">
@@ -24,6 +24,12 @@
 			<if test="roleCode != null and roleCode != ''">
 				AND ur2.role_code = #{roleCode}
 			</if>
+			<if test="roleCodes != null and roleCodes.length gt 0">
+				AND ur2.role_code IN
+				<foreach collection="roleCodes" item="roleCode" open="(" separator="," close=")">
+					#{roleCode}
+				</foreach>
+			</if>
 			<if test="employee.postCode != null and employee.postCode != ''">
 				AND (
 					ep.post_code = #{employee.postCode}