From aab8023f1a8f572f206788b6b6ed96055697f932 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Thu, 14 Apr 2022 14:56:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=87=E6=9C=AC=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20=E5=AE=8C=E5=96=84=20=E8=A1=A5=E5=85=85=E6=B5=B7=E5=A4=96?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=88=E5=8E=9F=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=9B=BD=E5=86=85=E5=AD=97=E6=AE=B5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index f16e9c4e..ea7ad48e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -286,7 +287,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileType(String standId){ List fileType = dao.getFileType(standId); - Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + List res=new ArrayList<>(); + res= (List) CollectionUtils.union(InitStandAttrUtil.standInlandAttrFieldList, InitStandAttrUtil.standForeignAttrFieldList); + Map typeNameMap = res.stream() .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); List> collect = fileType.stream() @@ -299,7 +302,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileTypeHG(String standId){ List fileType = dao.getFileTypeHG(standId); - Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + List res=new ArrayList<>(); + res= (List) CollectionUtils.union(InitStandAttrUtil.standInlandAttrFieldList, InitStandAttrUtil.standForeignAttrFieldList); + Map typeNameMap = res.stream() .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); List> collect = fileType.stream()