diff --git a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java index 5037b4a75..11859c1d5 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java @@ -12,6 +12,8 @@ public class FilterAuthUserRequest extends ListPageRequest { private String userName; + private String deptName; + private Integer userFlag; private Long roleId; diff --git a/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java b/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java index 998eabc46..163b74e6d 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java +++ b/src/main/java/com/glxp/api/req/auth/FilterDeptUserReqeust.java @@ -7,6 +7,6 @@ import lombok.Data; public class FilterDeptUserReqeust extends ListPageRequest { private Long deptId; private Long userId; - + private String deptName; private String key; } diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index 8ba584c10..f3cf1b4a5 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -23,6 +23,12 @@ AND userName != #{neUserName} + + AND auth_dept.name LIKE CONCAT('%', #{deptName}, '%') + + + AND auth_dept.name != #{deptName} + - AND (outType ]]> #{outType} or outType is NULL) + AND (outType = #{outType} or outType is NULL)