From cf8103f1c09fc43f3df643ea8f2a22cc26af74e8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 20 九月 2023 08:56:48 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/util/VciBaseUtil.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 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..4e65f82 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;
 				}
@@ -1420,6 +1424,12 @@
 
 		return sb.toString();
 	}
-
+	public static String intToRomans(int num) {
+		String M[] = {"", "M", "MM", "MMM"};
+		String C[] = {"", "C", "CC", "CCC", "CD", "D", "DC", "DCC", "DCCC", "CM"};
+		String X[] = {"", "X", "XX", "XXX", "XL", "L", "LX", "LXX", "LXXX", "XC"};
+		String I[] = {"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX"};
+		return M[num/1000]+C[(num%1000)/100]+X[(num%100)/10]+I[num%10];
+	}
 }
 

--
Gitblit v1.9.3