Commit e5fa9b71 by jiang'yun

修改

parent f87cf8ec
...@@ -1687,7 +1687,7 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1687,7 +1687,7 @@ public class DjdcServiceImpl implements DjdcService {
for(SjDcfxDzfc sjDcfxDzfc:list){ for(SjDcfxDzfc sjDcfxDzfc:list){
if(StringUtils.isNotEmpty(sjDcfxDzfc.getYxts())){ if(StringUtils.isEmpty(sjDcfxDzfc.getYxts())){
String dc = sjDcfxDzfc.getDzfc(); String dc = sjDcfxDzfc.getDzfc();
List<String> collect = dzgzzbs.stream().filter(dzgzzb -> dzgzzb.getDzfc().equals(dc)).map(dzgzzb -> StringUtils.isNotEmpty(dzgzzb.getZyyx()) ? dzgzzb.getZyyx().replaceAll("、", ",") : "").collect(Collectors.toList()); List<String> collect = dzgzzbs.stream().filter(dzgzzb -> dzgzzb.getDzfc().equals(dc)).map(dzgzzb -> StringUtils.isNotEmpty(dzgzzb.getZyyx()) ? dzgzzb.getZyyx().replaceAll("、", ",") : "").collect(Collectors.toList());
if(collect.size()>0){ if(collect.size()>0){
...@@ -1700,14 +1700,7 @@ public class DjdcServiceImpl implements DjdcService { ...@@ -1700,14 +1700,7 @@ public class DjdcServiceImpl implements DjdcService {
} }
} }
list=list.stream().filter(item -> item.getCs()!=null).collect(Collectors.toList()); list=list.stream().filter(item -> item.getCs()!=null).collect(Collectors.toList());
return list; return list;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment