From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 03 四月 2025 14:35:02 +0800
Subject: [PATCH] 添加非密字段显示

---
 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 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..96136f5 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
@@ -1,22 +1,24 @@
 package com.vci.rmip.code.client.codeapply.Apply410;
 
+import java.io.IOException;
 import java.util.*;
-import com.alibaba.cloud.commons.lang.StringUtils;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.vci.base.ui.swing.VCIOptionPane;
 import com.vci.base.ui.swing.components.table.AbstractVCIJTableDataProvider;
 import com.vci.base.ui.swing.components.table.VCIJTableNode;
-import com.vci.rmip.code.client.codeapply.Apply410.object.BaseModel;
 import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassify;
+import com.vci.rmip.code.client.codeapply.Apply410.object.CodeClassifyTemplateVO;
 import com.vci.rmip.code.client.codeapply.Apply410.object.DataGrid;
 import com.vci.rmip.code.client.codeapply.Apply410.object.R;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.page.BaseModel;
+import com.vci.rmip.code.client.codeapply.Apply410.object.ubcscode.vo.CodeClassifyTemplateAttrVO;
 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.CodeClassifyTemplateVO;
 import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.rmip.code.client.codeapply.Apply410.utils.VciBaseUtil;
+
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.map.ObjectMapper;
 
 public class CodeApplyFor410SearchProvider extends AbstractVCIJTableDataProvider<BaseModel> {
 	private String[] fields = {};
@@ -36,10 +38,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 +63,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);
@@ -100,19 +102,18 @@
 			}else{
 				VCIOptionPane.showMessage(this.dialog,r.getMsg());
 			}
-		} catch (
-		JsonProcessingException e) {
+		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		this.total= new Long(dataGrid.getTotal()).intValue();
 		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