From 69066c59f899aaa035492b712045d66df65d39bb Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 25 八月 2023 14:57:08 +0800
Subject: [PATCH] 处理basemodel，bean里面遇到字段相同且map里面数据为空，则使用bean里面的值
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
index 288ae1f..4ccbc9b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java
@@ -1344,7 +1344,8 @@
// Map resulMapChild = (Map) mapData;
for (Object o : mapData.keySet()) {
if(existFild == null || existFild.contains(String.valueOf(o).toLowerCase())){
- if(Func.isNotBlank(String.valueOf(returnMap.get(String.valueOf(o).toLowerCase())))
+ if((Func.isNotBlank(String.valueOf(returnMap.get(String.valueOf(o).toLowerCase())))
+ && returnMap.get(String.valueOf(o).toLowerCase()) !=null)
&& Func.isBlank(String.valueOf(mapData.get(o)))){
continue;
}
--
Gitblit v1.9.3