From 5fe7fb40670ba73514ab8ff81b59e9c06de014a0 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Fri, 7 Jul 2023 11:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/glxp/api/req/auth/FilterAuthUserRequest.java | 2 ++
.../java/com/glxp/api/req/auth/FilterDeptUserReqeust.java | 2 +-
src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml | 6 ++++++
src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
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)