From 7d832f295c7f1bd1d2fb293fe875a41adfc21397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 24 Dec 2018 23:46:49 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=20mybatis=20?=
 =?UTF-8?q?=E5=B5=8C=E5=A5=97=E5=88=86=E9=A1=B5=E4=B8=8D=E5=87=86=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AD=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysUserMapper.xml   | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index a3fddcffd..de0cb70cf 100644
--- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -21,21 +21,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pig4cloud.pigx.admin.mapper.SysUserMapper">
 	<!-- 通用查询映射结果 -->
-	<resultMap id="baseResultMap" type="com.pig4cloud.pigx.admin.api.entity.SysUser">
+	<resultMap id="baseResultMap" type="com.pig4cloud.pigx.admin.api.vo.UserVO">
 		<id column="user_id" property="userId"/>
 		<result column="username" property="username"/>
 		<result column="password" property="password"/>
+		<result column="salt" property="salt"/>
 		<result column="phone" property="phone"/>
 		<result column="avatar" property="avatar"/>
-		<result column="salt" property="salt"/>
-		<result column="dept_id" property="deptId"/>
-		<result column="tenant_id" property="tenantId"/>
 		<result column="wx_openid" property="wxOpenid"/>
 		<result column="qq_openid" property="qqOpenid"/>
-		<result column="create_time" property="createTime"/>
-		<result column="update_time" property="updateTime"/>
-		<result column="del_flag" property="delFlag"/>
+		<result column="ucreate_time" property="createTime"/>
+		<result column="uupdate_time" property="updateTime"/>
 		<result column="lock_flag" property="lockFlag"/>
+		<result column="udel_flag" property="delFlag"/>
+		<result column="deptId" property="deptId"/>
+		<result column="tenantId" property="tenantId"/>
+		<result column="deptName" property="deptName"/>
+		<collection property="roleList" ofType="com.pig4cloud.pigx.admin.api.entity.SysRole"
+					select="com.pig4cloud.pigx.admin.mapper.SysRoleMapper.listRolesByUserId" column="user_id">
+		</collection>
 	</resultMap>
 
 	<!-- userVo结果集 -->
@@ -135,22 +139,34 @@
            `user`.user_id = #{id}
     </select>
 
-	<select id="getUserVosPage" resultMap="userVoResultMap">
+	<select id="getUserVosPage" resultMap="baseResultMap">
 		SELECT
-		<include refid="userRoleSql"/>
+		`user`.user_id,
+		`user`.username,
+		`user`.`password`,
+		`user`.salt,
+		`user`.phone,
+		`user`.avatar,
+		`user`.wx_openid,
+		`user`.qq_openid,
+		`user`.dept_id,
+		`user`.create_time AS ucreate_time,
+		`user`.update_time AS uupdate_time,
+		`user`.del_flag AS udel_flag,
+		`user`.lock_flag AS lock_flag,
+		`user`.dept_id AS deptId,
+		`user`.tenant_id AS tenantId
 		FROM
 		sys_user AS `user`
-		LEFT JOIN sys_user_role AS ur ON ur.user_id = `user`.user_id
-		LEFT JOIN sys_role AS r ON r.role_id = ur.role_id
 		LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id
-		WHERE
-		r.del_flag = 0
-		<if test="query.username != null and query.username != ''">
-			and `user`.username LIKE CONCAT('%',#{query.username},'%')
-		</if>
-		<if test="query.deptId != null and query.deptId != ''">
-			and `user`.dept_id = #{query.deptId}
-		</if>
+		<where>
+			<if test="query.username != null and query.username != ''">
+				and `user`.username LIKE CONCAT('%',#{query.username},'%')
+			</if>
+			<if test="query.deptId != null and query.deptId != ''">
+				and `user`.dept_id = #{query.deptId}
+			</if>
+		</where>
 		ORDER BY `user`.create_time DESC
 	</select>
 </mapper>