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 { List selectNextUsers(@Param("institutionIds") List institutionIds,@Param("userName") String userName); - List selectNextUserByIds(@Param("ids") List ids); + List selectNextUserByIds(@Param("ids") List ids); List selectTreeByIds(@Param("rootIds") List 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 getNextById(String ids){ List strings=new ArrayList<>(Arrays.asList(ids.split(","))); - List tsUsers=tsInstitutionDao.selectNextUserByIds(strings); - - return tsUsers; + List tsUsers=tsInstitutionDao.selectNextUserByIds(strings); + List res=new ArrayList<>(); + if (null!=tsUsers && tsUsers.size()>0){ + Map 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; }