From 3019ece8c33106ca1e86405a4f40d3f5bf536320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Tue, 31 Dec 2019 10:24:07 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysUserMapper.xml   | 124 +++++++++---------
 1 file changed, 62 insertions(+), 62 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 fd502e41a..1e6dfd35c 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
@@ -70,49 +70,49 @@
 	</resultMap>
 
 	<sql id="userRoleSql">
-		`user`.user_id,
-		`user`.username,
-		`user`.`password`,
-		`user`.salt,
-		`user`.phone,
-		`user`.avatar,
-		`user`.wx_openid,
-		`user`.qq_openid,
-		`user`.dept_id,
-		`user`.del_flag,
-		`user`.lock_flag,
-		`user`.tenant_id,
-		`user`.create_time AS ucreate_time,
-		`user`.update_time AS uupdate_time,
+		u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
 		r.role_id,
 		r.role_name,
 		r.role_code,
 		r.role_desc,
-		r.create_time AS rcreate_time,
-		r.update_time AS rupdate_time
+		r.create_time  rcreate_time,
+		r.update_time  rupdate_time
 	</sql>
 
 	<sql id="userRoleDeptSql">
-		`user`.user_id,
-		`user`.username,
-		`user`.`password`,
-		`user`.salt,
-		`user`.phone,
-		`user`.avatar,
-		`user`.wx_openid,
-		`user`.qq_openid,
-		`user`.del_flag,
-		`user`.lock_flag,
-		`user`.tenant_id,
-		`user`.create_time AS ucreate_time,
-		`user`.update_time AS uupdate_time,
+		u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
 		r.role_id,
 		r.role_name,
 		r.role_code,
 		r.role_desc,
-		r.create_time AS rcreate_time,
-		r.update_time AS rupdate_time,
-		d.name AS dept_name,
+		r.create_time  rcreate_time,
+		r.update_time  rupdate_time,
+		d.name  dept_name,
 		d.dept_id
     </sql>
 
@@ -120,53 +120,53 @@
 		SELECT
 			<include refid="userRoleSql"/>
 		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
-			WHERE `user`.username = #{username}
+		sys_user  u
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+			WHERE u.username = #{username}
 	</select>
 
 	<select id="getUserVoById" resultMap="userVoResultMap">
         SELECT
 	   		<include refid="userRoleDeptSql"/>
         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
+            sys_user  u
+            LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+            LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+            LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
         WHERE
-           `user`.user_id = #{id}
+           u.user_id = #{id}
     </select>
 
 	<select id="getUserVosPage" resultMap="baseResultMap">
 		SELECT
-		`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,
-		`user`.lock_flag,
-		`user`.tenant_id,
-		 d.name AS dept_name
+		u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		 d.name  dept_name
 		FROM
-		sys_user AS `user`
-		LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id
+		sys_user  u
+		LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
 		<where>
-			`user`.del_flag = '0'
+			u.del_flag = '0'
 			<if test="query.username != null and query.username != ''">
-				AND `user`.username LIKE CONCAT('%',#{query.username},'%')
+				AND u.username LIKE CONCAT('%',#{query.username},'%')
 			</if>
 			<if test="query.deptId != null and query.deptId != ''">
-				AND `user`.dept_id = #{query.deptId}
+				AND u.dept_id = #{query.deptId}
 			</if>
 		</where>
-		ORDER BY `user`.create_time DESC
+		ORDER BY u.create_time DESC
 	</select>
 </mapper>