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 implements @Override public IPage getAllUsers(TsUser tsUser) { List ids=new ArrayList<>(); - ids.add(tsUser.getInstitutionId()); + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.like("parent_id",tsUser.getInstitutionId()); + List tsmiddle=tsInstitutionService.list(queryWrapper); + if(tsmiddle!=null && !tsmiddle.isEmpty()){ + tsmiddle.forEach(tsInstitution -> { + ids.add(tsInstitution.getId()); + }); + } // List 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 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},'%') - and - - ti.parent_ids like concat('%',#{id},'%') + and INSTITUTION_ID in + + #{id} 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 and u.uname like concat('%',#{TsUser.uname},'%') @@ -117,9 +113,9 @@ and u.email like concat('%',#{TsUser.email},'%') - and - - ti.parent_ids like concat('%',#{id},'%') + and INSTITUTION_ID in + + #{id}