From 7e9203562933ffa67b36a5280fa9ccc32e9f4839 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 九月 2023 15:34:35 +0800
Subject: [PATCH] 前端代码打包

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java |    6 +++++-
 1 files changed, 5 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..4c9563c 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
@@ -1302,6 +1302,9 @@
 		Field[] declaredFields = type.getDeclaredFields();
 		Map<String, String> fieldMap = new HashMap();
 		String existField = "";
+		if(existFild == null){
+			existFild = new HashSet<>();
+		}
 		for (Field declaredField : declaredFields) {
 			declaredField.setAccessible(true);
 
@@ -1344,7 +1347,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