|
|
@@ -5,8 +5,8 @@
|
|
|
<mapper namespace="com.ydtech.modules.admin.dao.SysUserLinkAreaMapper">
|
|
|
<sql id="Base_Column_List">
|
|
|
link.id as id,
|
|
|
- user.id as "sysUser.id",
|
|
|
- user.name as "sysUser.name",
|
|
|
+ u.id as "sysUser.id",
|
|
|
+ u.name as "sysUser.name",
|
|
|
t2.id AS "sysUser.deptId",
|
|
|
t2.`name` AS "sysUser.deptName",
|
|
|
area.id as "area.id",
|
|
|
@@ -20,8 +20,8 @@
|
|
|
<include refid="Base_Column_List"/>
|
|
|
FROM
|
|
|
sys_user_link_area link
|
|
|
- LEFT JOIN sys_user USER ON link.user_id = USER.id
|
|
|
- LEFT JOIN sys_dept t2 ON USER.dept_id = t2.id
|
|
|
+ LEFT JOIN sys_user u ON link.user_id = u.id
|
|
|
+ LEFT JOIN sys_dept t2 ON u.dept_id = t2.id
|
|
|
LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
|
|
|
LEFT JOIN sys_area area ON link.area_code = area.area_code
|
|
|
LEFT JOIN sys_area pArea ON pArea.area_code = area.upper_code
|
|
|
@@ -31,7 +31,7 @@
|
|
|
and link.user_id = #{vo.userId}
|
|
|
</if>
|
|
|
<if test="vo.userName != null and vo.userName != ''">
|
|
|
- and USER.name like CONCAT('%', #{vo.userName}, '%')
|
|
|
+ and u.name like CONCAT('%', #{vo.userName}, '%')
|
|
|
</if>
|
|
|
<if test="vo.areaCode != null and vo.areaCode != ''">
|
|
|
and EXISTS (
|
