Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
Project
Project
Details
Activity
Releases
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
李丛阳
education
Commits
861c3d09
Commit
861c3d09
authored
Sep 29, 2019
by
luzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corpid
parent
323fff11
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
5 deletions
+8
-5
SysUserController.java
...va/org/rcisoft/sys/user/controller/SysUserController.java
+1
-1
SysUserMapper.java
src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java
+4
-1
SysUserService.java
...ain/java/org/rcisoft/sys/user/service/SysUserService.java
+1
-1
SysUserServiceImpl.java
...org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java
+2
-2
No files found.
src/main/java/org/rcisoft/sys/user/controller/SysUserController.java
View file @
861c3d09
...
...
@@ -51,7 +51,7 @@ public class SysUserController extends PaginationController<SysUser> {
@ApiImplicitParam
(
name
=
"roleName"
,
value
=
"用户角色"
,
required
=
false
,
dataType
=
"varchar"
)})
@GetMapping
(
value
=
"/queryUsers"
)
public
GridModel
queryUsers
(
CurUser
curUser
,
@Valid
QuerySysUserDTO
dto
,
BindingResult
br
)
{
userServiceImpl
.
queryUsersByPagination
(
getPaginationUtility
(),
dto
);
userServiceImpl
.
queryUsersByPagination
(
getPaginationUtility
(),
dto
,
curUser
.
getCorpId
()
);
GridModel
gridModel
=
getGridModelResponse
();
return
gridModel
;
}
...
...
src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java
View file @
861c3d09
...
...
@@ -21,11 +21,14 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
"LEFT JOIN tm_admin_role AS sr ON sr.r_id = ru.role_id "
+
"WHERE su.del_flag = 0 "
+
"and sr.r_status != 0 "
+
"and corp_id = #{corpId} "
+
"<if test=\"name!=null and name != ''\"> and su.name like CONCAT('%',#{name},'%') </if>"
+
"<if test=\"roleName!=null and roleName != ''\"> and sr.role_name = #{roleName}</if>"
+
"<if test=\"flag!=null and flag != ''\"> and su.flag = #{flag}</if></script>"
)
@ResultMap
(
value
=
"BaseResultMap"
)
List
<
SysUser
>
queryUsers
(
QuerySysUserDTO
dto
);
List
<
SysUser
>
queryUsers
(
QuerySysUserDTO
dto
,
@Param
(
"cropId"
)
String
corpId
);
@Select
(
"<script>SELECT sr.r_name AS roleList "
+
"FROM s_user AS su "
+
...
...
src/main/java/org/rcisoft/sys/user/service/SysUserService.java
View file @
861c3d09
...
...
@@ -19,7 +19,7 @@ public interface SysUserService {
String
checkPassword
(
String
userId
);
List
<
SysUser
>
queryUsersByPagination
(
PageUtil
pageUtil
,
QuerySysUserDTO
dto
);
List
<
SysUser
>
queryUsersByPagination
(
PageUtil
pageUtil
,
QuerySysUserDTO
dto
,
String
cropId
);
int
removeUser
(
String
id
);
...
...
src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java
View file @
861c3d09
...
...
@@ -40,8 +40,8 @@ public class SysUserServiceImpl implements SysUserService {
private
Global
global
;
@Override
public
List
<
SysUser
>
queryUsersByPagination
(
PageUtil
pageUtil
,
QuerySysUserDTO
dto
)
{
return
sysUserMapper
.
queryUsers
(
dto
);
public
List
<
SysUser
>
queryUsersByPagination
(
PageUtil
pageUtil
,
QuerySysUserDTO
dto
,
String
corpId
)
{
return
sysUserMapper
.
queryUsers
(
dto
,
corpId
);
}
@Override
...
...
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