zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-12 05:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 改进数据权限 驼峰配置 deptId --> dept_id

Browse Source
This commit is contained in:
冷冷 committed 2019-10-07 07:17:39 +08:00
1 parent 3caba5d77a
commit 311408da77
2 files changed
+20 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScope.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class DataScope extends HashMap {
/**
* 限制范围的字段名称
*/
private String scopeName = "deptId";
private String scopeName = "dept_id";
/**
* 具体的数据范围
pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+19 -20
View File
@@ -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