From 27b91f8e9bccc3bbc50ae76d89e9024dc631fc33 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Thu, 7 Apr 2022 16:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E4=BA=BA=E7=BB=84=E4=BB=B6=20?=
 =?UTF-8?q?=E4=BA=BA=E5=92=8B=E9=80=89=E9=A1=BA=E5=BA=8F=E5=92=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarInstitution/dao/TsInstitutionDao.java   |  3 ++-
 .../service/impl/TsInstitutionServiceImpl.java | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

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 c2565c52..fae48109 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
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarInstitution.dao;
 
 import com.adc.da.slrs.sarInstitution.entity.InstitutionAndUser;
 import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.entity.TsUserVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -31,7 +32,7 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
 
     List<TsInstitution> selectNextUsers(@Param("institutionIds") List<String> institutionIds,@Param("userName") String userName);
 
-    List<TsInstitution> selectNextUserByIds(@Param("ids") List<String> ids);
+    List<TsUserVO> selectNextUserByIds(@Param("ids") List<String> ids);
 
 
     List<TsInstitution> selectTreeByIds(@Param("rootIds") List<String> rootIds);
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 c135a65d..0a819b65 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
@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -227,9 +228,20 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
 
     public List<TsInstitution> getNextById(String ids){
         List<String> strings=new ArrayList<>(Arrays.asList(ids.split(",")));
-        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
-
-        return tsUsers;
+        List<TsUserVO> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
+        List<TsInstitution> res=new ArrayList<>();
+        if (null!=tsUsers && tsUsers.size()>0){
+            Map<String,TsUserVO> middle=new HashMap<>();
+            for (TsUserVO u:tsUsers) {
+                middle.put(u.getId(),u);
+            }
+            strings.forEach(s -> {
+                TsInstitution ins=new TsInstitution();
+                BeanUtils.copyProperties(middle.get(s),ins);
+                res.add(ins);
+            });
+        }
+        return res;
     }