From 0e5ba7238d31dc8fb5015001661811dceab55c42 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 09:02:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
index ad3d323..ced587b 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java
@@ -13,6 +13,7 @@
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ListUtil;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -36,10 +37,10 @@
CodeClassifyTemplateVO codeClassifyTemplateVO=this.dialog.getOwnerPanel().getCurrentCodeClassifyTemplateVO();
if(codeClassifyTemplateVO!=null){
if(!CollectionUtils.isEmpty(codeClassifyTemplateVO.getAttributes())){
- codeClassifyTemplateVO.getAttributes().stream().forEach(codeClassifyTemplateAttrVO -> {
+ for (CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO : codeClassifyTemplateVO.getAttributes()) {
fieldList.add(codeClassifyTemplateAttrVO.getId());
nameList.add(codeClassifyTemplateAttrVO.getName());
- });
+ }
}
}
fields = fieldList.toArray(new String[]{});
@@ -61,11 +62,11 @@
String data="";
for (String field:fields){
if(defaultDataMap.containsKey(field+"_text")){
- data=defaultDataMap.getOrDefault(field+"_text","");
+ data=defaultDataMap.get(field+"_text") ;
}else if(defaultDataMap.containsKey(field+"Text")){
- data=defaultDataMap.getOrDefault(field+"Text","");
+ data=defaultDataMap.get(field+"Text") ;
}else{
- data=defaultDataMap.getOrDefault(field,"");
+ data=defaultDataMap.get(field);
}
res.setPropertyValue(getColumns()[i++], data);
@@ -108,11 +109,11 @@
List<Map> dataList= dataGrid.getData();
List<BaseModel> hostInfos=new ArrayList<>();
//List<BaseModel> hostInfos= ListUtil.listMapParseListObj(dataList, BaseModel.class);
- dataList.stream().forEach(map->{
+ for (Map map : dataList) {
BaseModel baseModel= ListUtil.mapParseJavaBean(map,BaseModel.class);
baseModel.setData(map);
hostInfos.add(baseModel);
- });
+ }
//List<BaseModel> hostInfos = (List<BaseModel>) dataList.stream().map(entity -> JSONUtil.toBean(JSONUtil.parseObj(entity), BaseModel.class)).collect(Collectors.toList());
--
Gitblit v1.9.3