From 311408da77c0626bed0c1b9b35aad5d174879f54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Mon, 7 Oct 2019 07:17:39 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=20=E9=A9=BC=E5=B3=B0=E9=85=8D=E7=BD=AE=20dep?=
 =?UTF-8?q?tId=20-->=20dept=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/common/data/datascope/DataScope.java |  2 +-
 .../main/resources/mapper/SysUserMapper.xml   | 39 +++++++++----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java
index 4fa3c9c63..8b36f7dc6 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java
@@ -35,7 +35,7 @@ public class DataScope extends HashMap {
 	/**
 	 * 限制范围的字段名称
 	 */
-	private String scopeName = "deptId";
+	private String scopeName = "dept_id";
 
 	/**
 	 * 具体的数据范围
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 d3c943dd2..fd502e41a 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
@@ -34,9 +34,9 @@
 		<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"/>
+		<result column="dept_id" property="deptId"/>
+		<result column="tenant_id" property="tenantId"/>
+		<result column="dept_name" 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>
@@ -56,9 +56,9 @@
 		<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"/>
+		<result column="dept_id" property="deptId"/>
+		<result column="tenant_id" property="tenantId"/>
+		<result column="dept_name" property="deptName"/>
 		<collection property="roleList" ofType="com.pig4cloud.pigx.admin.api.entity.SysRole">
 			<id column="role_id" property="roleId"/>
 			<result column="role_name" property="roleName"/>
@@ -79,12 +79,11 @@
 		`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,
-		`user`.del_flag AS udel_flag,
-		`user`.lock_flag AS lock_flag,
-		`user`.dept_id AS deptId,
-		`user`.tenant_id AS tenantId,
 		r.role_id,
 		r.role_name,
 		r.role_code,
@@ -102,19 +101,19 @@
 		`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,
-		`user`.del_flag AS udel_flag,
-		`user`.lock_flag AS lock_flag,
-		`user`.tenant_id AS tenantId,
 		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 deptName,
-		d.dept_id AS deptId
+		d.name AS dept_name,
+		d.dept_id
     </sql>
 
 	<select id="getUserVoByUsername" resultMap="userVoResultMap">
@@ -149,13 +148,13 @@
 		`user`.avatar,
 		`user`.wx_openid,
 		`user`.qq_openid,
-		`user`.dept_id AS deptId,
+		`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`.tenant_id AS tenantId,
-		 d.name AS deptName
+		`user`.del_flag,
+		`user`.lock_flag,
+		`user`.tenant_id,
+		 d.name AS dept_name
 		FROM
 		sys_user AS `user`
 		LEFT JOIN sys_dept AS d ON d.dept_id = `user`.dept_id