From 0f3e60feb82fca2444ddf182afb250be1970fb9c Mon Sep 17 00:00:00 2001
From: zyd <yanduan0908@hotmail.com>
Date: Wed, 21 Sep 2022 00:26:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=9F=E5=BA=A6=E6=85=A2=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarUser/service/impl/TsUserServiceImpl.java  |  9 ++++++++-
 .../mybatis/mapper/sarUser/TsUserMapper.xml      | 16 ++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
index f8ec0b0a..721e7ecf 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
@@ -459,7 +459,14 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
     @Override
     public IPage<TsUser> getAllUsers(TsUser tsUser) {
         List<String> ids=new ArrayList<>();
-        ids.add(tsUser.getInstitutionId());
+        QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
+        queryWrapper.like("parent_id",tsUser.getInstitutionId());
+        List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
+        if(tsmiddle!=null && !tsmiddle.isEmpty()){
+            tsmiddle.forEach(tsInstitution -> {
+                ids.add(tsInstitution.getId());
+            });
+        }
 //        List<String> middle=new ArrayList<>();
 //        middle.addAll(ids);
 //        boolean flag=true;
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 f32be093..5950d26a 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
@@ -82,8 +82,6 @@
         on u.usid=up.user_id
         left join ts_position p
         on up.position_id=p.id
-        left join ts_institution ti
-        on ti.id = u.INSTITUTION_ID
         where 1=1
         <if test="TsUser.uname != null and TsUser.uname != '' ">
             and (u.uname like concat('%',#{TsUser.uname},'%') or u.ACCOUNT like concat(#{TsUser.uname},'%'))
@@ -92,9 +90,9 @@
             and u.email like concat('%',#{TsUser.email},'%')
         </if>
         <if test=" null != ids and ids.size()> 0">
-            and
-            <foreach item="id" collection="ids" open="(" separator="or" close=")" index="index">
-                ti.parent_ids like concat('%',#{id},'%')
+            and INSTITUTION_ID in
+            <foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
+                #{id}
             </foreach>
         </if>
             ORDER BY p.id is null,p.create_time
@@ -107,8 +105,6 @@
         on u.usid=up.user_id
         left join ts_position p
         on up.position_id=p.id
-        left join ts_institution ti
-        on ti.id = u.INSTITUTION_ID
         where 1=1
         <if test="TsUser.uname != null and TsUser.uname != '' ">
             and u.uname like concat('%',#{TsUser.uname},'%')
@@ -117,9 +113,9 @@
             and u.email like concat('%',#{TsUser.email},'%')
         </if>
         <if test=" null != ids and ids.size()> 0">
-            and
-            <foreach item="id" collection="ids" open="(" separator="or" close=")" index="index">
-                ti.parent_ids like concat('%',#{id},'%')
+            and INSTITUTION_ID in
+            <foreach item="id" collection="ids" open="(" separator="," close=")" index="index">
+                #{id}
             </foreach>
         </if>
     </select>