From d970690908a17f866a9899abe39ae94f7c8d1e13 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 8 Nov 2021 14:48:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=BA=BA=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarInstitution/controller/TsInstitutionController.java    | 4 ++--
 .../com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java  | 2 +-
 .../da/slrs/sarInstitution/service/ITsInstitutionService.java | 2 +-
 .../sarInstitution/service/impl/TsInstitutionServiceImpl.java | 4 ++--
 .../mybatis/mapper/sarInstitution/TsInstitutionMapper.xml     | 3 +++
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
index 1615a683..b3887516 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
@@ -82,8 +82,8 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
 
     @ApiOperation("获得下一级的部门和人员")
     @GetMapping("/getNext")
-    public List<TsInstitution> getNext(String institutionId){
-        return tsInstitutionService.getNext(institutionId);
+    public List<TsInstitution> getNext(String institutionId,String userName){
+        return tsInstitutionService.getNext(institutionId,userName);
     }
 
     @ApiOperation("获得第一级部门目录")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
index 8f7b76a9..bc0b5780 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
@@ -27,7 +27,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      * 根据部门id查询此部门的子一级人员
      * @return
      */
-    List<TsInstitution> selectNextUser(String institutionId);
+    List<TsInstitution> selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName);
 
 
     List<TsInstitution> selectTreeByIds(@Param("rootIds") List<String> rootIds);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
index af1e8996..48d24c8b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
@@ -35,7 +35,7 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      * @param institutionId
      * @return
      */
-    public List<TsInstitution> getNext(String institutionId);
+    public List<TsInstitution> getNext(String institutionId,String userName);
 
     /**
      * 获得第一级的部门
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
index 0d78c184..ce821462 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
@@ -204,9 +204,9 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
      * 通过部门id获得这个部门下的下一级部门
      * @return
      */
-    public List<TsInstitution> getNext(String institutionId){
+    public List<TsInstitution> getNext(String institutionId,String userName){
         List<TsInstitution> tsInstitutions = tsInstitutionDao.selectNextInstitution(institutionId);
-        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUser(institutionId);
+        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUser(institutionId,userName);
 
 
         for(TsInstitution tsInstitution:tsInstitutions){
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
index b3f53de2..1678191c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
@@ -39,6 +39,9 @@
     <select id="selectNextUser" resultMap="TsUser">
         select * from ts_user
 		WHERE institution_id=#{institutionId}
+		<if test="userName != null and userName != '' ">
+            and ( ts_user.ACCOUNT like concat(concat('%',#{userName}),'%') or ts_user.UNAME like concat(concat('%',#{userName}),'%') )
+        </if>
     </select>
 
     <select id="selectTreeByIds" resultMap="TsInstitution">