Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
0fe1874a
Commit
0fe1874a
authored
Sep 11, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.5.8-hgw-权限-角色-账号
parent
3f62427f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
14 deletions
+33
-14
SysUserPermission.java
...oud/plus/v1/yifu/permission/entity/SysUserPermission.java
+1
-0
SysUserInfoMapper.xml
...ssion-biz/src/main/resources/mapper/SysUserInfoMapper.xml
+32
-14
No files found.
yifu-permission/yifu-permission-api/src/main/java/com/yifu/cloud/plus/v1/yifu/permission/entity/SysUserPermission.java
View file @
0fe1874a
...
...
@@ -53,6 +53,7 @@ public class SysUserPermission extends BaseEntity {
/**
* 权限类型
* 1客户权限;2商机;3报价单;4合同;5项目;6BU;7条线;8部门;9收入归属
*/
@Schema
(
description
=
"权限类型"
)
private
String
permissionType
;
...
...
yifu-permission/yifu-permission-biz/src/main/resources/mapper/SysUserInfoMapper.xml
View file @
0fe1874a
...
...
@@ -81,9 +81,6 @@
<if
test=
"sysUserInfo.status != null"
>
AND a.status = #{sysUserInfo.status}
</if>
<if
test=
"sysUserInfo.roleNames != null and sysUserInfo.roleNames.trim() != ''"
>
AND r.role_name like concat('%',#{sysUserInfo.roleNames},'%')
</if>
<if
test=
"sysUserInfo.createBy != null and sysUserInfo.createBy.trim() != ''"
>
AND a.CREATE_BY = #{sysUserInfo.createBy}
</if>
...
...
@@ -103,18 +100,39 @@
</sql>
<!--sysUserInfo简单分页查询-->
<select
id=
"getSysUserInfoPage"
resultMap=
"sysUserInfoMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM sys_user_info a
LEFT JOIN sys_user_role_res res on a.fd_id=res.user_id
LEFT JOIN sys_role_info r on res.role_id=r.fd_id and r.delete_flag = 0 and r.status = 0
<where>
1=1
<include
refid=
"sysUserInfo_where"
/>
</where>
GROUP BY a.fd_id
SELECT
a.fd_id,
a.fd_name,
a.fd_login_name,
a.fd_ldap_dn,
a.fd_dept_name,
a.fd_mobile_no,
a.fd_email,
a.status,
a.role_names,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
from (
SELECT
<include
refid=
"Base_Column_List"
/>
FROM sys_user_info a
LEFT JOIN sys_user_role_res res on a.fd_id=res.user_id
LEFT JOIN sys_role_info r on res.role_id=r.fd_id and r.delete_flag = 0 and r.status = 0
<where>
1=1
<include
refid=
"sysUserInfo_where"
/>
</where>
GROUP BY a.fd_id
) a
<if
test=
"sysUserInfo != null"
>
<if
test=
"sysUserInfo.roleNames != null and sysUserInfo.roleNames.trim() != ''"
>
AND a.role_names like concat('%',#{sysUserInfo.roleNames},'%')
</if>
</if>
order by a.CREATE_TIME desc
</select>
<!--list-->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment