From 4ace839e1f7a5480bc8b289f2edb271c8fd9dab4 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Wed, 23 Mar 2022 17:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=AA=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/slrs/sarUser/entity/RoleUserDTO.java |  4 ++++
 .../mybatis/mapper/sarUser/TsUserMapper.xml         | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java
index 106435a3..f237e296 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/RoleUserDTO.java
@@ -11,6 +11,10 @@ public class RoleUserDTO {
 //    要查询的角色
     private String roleId;
 
+    private String institutionName;
+
+    private String institutionId;
+
     private long pageNumber;
 
     private long pageSize;
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
index 6d27f23b..37ea1c1e 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarUser/TsUserMapper.xml
@@ -129,6 +129,7 @@
     </select>
     <select id="selectUserByRole" resultType="java.lang.Integer">
     SELECT count(ts_user.USID) from ts_user
+    left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
     LEFT JOIN ts_user_position on ts_user.USID = ts_user_position.user_id
     WHERE ts_user_position.position_id in (
 	SELECT ts_position_role.position_id from ts_position_role
@@ -139,6 +140,12 @@
         <if test="null != role.userName and role.userName != ''">
             and ts_user.UNAME  like concat(concat('%',#{role.userName}),'%')
         </if>
+        <if test="null != role.institutionName and role.institutionName != ''">
+            and ts_institution.name  like concat(concat('%',#{role.institutionName}),'%')
+        </if>
+        <if test="null != role.institutionId and role.institutionId != ''">
+            and ts_user.INSTITUTION_ID  = #{role.institutionId}
+        </if>
 
     </select>
 
@@ -155,6 +162,12 @@
         <if test="null != role.userName and role.userName != ''">
             and ts_user.UNAME  like concat(concat('%',#{role.userName}),'%')
         </if>
+        <if test="null != role.institutionName and role.institutionName != ''">
+            and ts_institution.name  like concat(concat('%',#{role.institutionName}),'%')
+        </if>
+        <if test="null != role.institutionId and role.institutionId != ''">
+            and ts_user.INSTITUTION_ID  = #{role.institutionId}
+        </if>
         limit ${(role.pageNumber - 1) * role.pageSize},${role.pageSize}
     </select>
 </mapper>