From a28075c184ffb2e9853233b7b66e3697e6b3f0b6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 29 八月 2023 21:53:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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