From e0a653a1dff5b8ad7e397369193d23db79c3a676 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 2 Aug 2022 10:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8Dur=E6=98=AFsql?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=EF=BC=8C=E5=AF=BC=E8=87=B4jsqlparse?=
 =?UTF-8?q?r=E4=B8=8D=E8=83=BD=E8=A7=A3=E6=9E=90?=
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, 4 insertions(+), 4 deletions(-)

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 b95e6af7..59078588 100644
--- a/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
+++ b/modules/core/src/main/resources/mappings/modules/sys/EmpUserDao.xml
@@ -7,7 +7,7 @@
 		SELECT ${sqlMap.column.toSql()}
 		FROM ${sqlMap.table.toSql()}
 		<if test="roleCode != null and roleCode != ''">
-			JOIN ${_prefix}sys_user_role ur ON ur.user_code = a.user_code
+			JOIN ${_prefix}sys_user_role ur2 ON ur2.user_code = a.user_code
 		</if>
 		<if test="employee.postCode != null and employee.postCode != ''">
 			JOIN ${_prefix}sys_employee_post ep ON e.emp_code = ep.emp_code
@@ -15,7 +15,7 @@
 		<where>
 			${sqlMap.where.toSql()}
 			<if test="roleCode != null and roleCode != ''">
-				AND ur.role_code = #{roleCode}
+				AND ur2.role_code = #{roleCode}
 			</if>
 			<if test="employee.postCode != null and employee.postCode != ''">
 				AND (
@@ -81,8 +81,8 @@
 		SELECT 
 		    <include refid="userColumns"/>
 		FROM ${_prefix}sys_user a
-		JOIN ${_prefix}sys_user_role ur ON ur.user_code = a.user_code
-		JOIN ${_prefix}sys_role r ON r.role_code = ur.role_code
+		JOIN ${_prefix}sys_user_role ur2 ON ur2.user_code = a.user_code
+		JOIN ${_prefix}sys_role r ON r.role_code = ur2.role_code
 		WHERE a.status = #{STATUS_NORMAL}
 			AND a.user_type = #{USER_TYPE_EMPLOYEE}
 			<if test="global.useCorpModel">