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/RMDataReferTempDialogActionListener.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
index 96e4caa..8af7e4f 100644
--- a/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
+++ b/Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java
@@ -65,8 +65,8 @@
if(treeNode.getObj() instanceof Tree) {
Tree tree =(Tree)treeNode.getObj();
Map<String,String> attibuteMap= tree.getAttributes();
- String fieldValue=attibuteMap.getOrDefault(valueField,"");
- String textValue=attibuteMap.getOrDefault(textField,"");
+ String fieldValue=attibuteMap.containsKey(valueField) ? attibuteMap.get(valueField) : "";
+ String textValue=attibuteMap.containsKey(textField) ? attibuteMap.get(textField) : "";
KeyValue keyValue=new KeyValue();
keyValue.setKey(fieldValue);
keyValue.setValue(textValue);
@@ -85,8 +85,8 @@
BaseModel baseModel=list.get(0);
Map<String, String> defaultDataMap= VciBaseUtil.objectToMapString(list.get(0));
defaultDataMap.putAll(baseModel.getData());
- String fieldValue=defaultDataMap.getOrDefault(valueField,"");
- String textValue=defaultDataMap.getOrDefault(textField,"");
+ String fieldValue=defaultDataMap.containsKey(valueField) ? defaultDataMap.get(valueField) : "";
+ String textValue=defaultDataMap.containsKey(textField) ? defaultDataMap.get(textField) : "";
KeyValue keyValue=new KeyValue();
keyValue.setKey(fieldValue);
keyValue.setValue(textValue);
--
Gitblit v1.9.3