From e50b37ea73d82149cd52646464389bf6010b1d22 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 12 十二月 2023 10:49:19 +0800
Subject: [PATCH] map对象大小写导致code返回为空问题

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 83d0d13..59caa32 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -9,9 +9,7 @@
 import org.springblade.core.tool.utils.Func;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 鏂板鏃堕粯璁ゅ�煎睘鎬ц祴鍊�
@@ -221,7 +219,7 @@
 
 			baseModel.setRevisionOid(dataMap.getOrDefault(isCase?"REVISIONOID":"revisionoid",""));
 			baseModel.setRevisionValue(dataMap.getOrDefault(isCase?"REVISIONVALUE":"revisionvalue",""));
-			baseModel.setLastModifier(AuthUtil.getUser().getAccount());
+			baseModel.setLastModifier(Func.isNotEmpty(user) ? user.getAccount():AuthUtil.getUser().getAccount());
 			baseModel.setLcStatus(dataMap.getOrDefault(isCase?"LCSTATUS":"lcstatus",""));
 			baseModel.setName(dataMap.getOrDefault(isCase?"NAME":"name",""));
 			baseModel.setTenantId(dataMap.getOrDefault(isCase?"TENANT_ID":"tenant_id",""));
@@ -259,4 +257,22 @@
 		return date;
 	}
 
+	/**
+	 * map瀵硅薄杞崲涓哄皬鍐�
+	 * @param dataMapList
+	 * @param isLowerCase
+	 */
+	public static void mapToLowerCase(List<Map<String,String>> dataMapList, boolean isLowerCase){
+		// 閬嶅巻List涓殑姣忎釜Map
+		for (Map<String, String> map : dataMapList) {
+			Map<String, String> newMap = new HashMap<>();
+			// 閬嶅巻姣忎釜Map涓殑key锛屽苟灏嗗叾杞崲涓哄皬鍐�
+			for (String key : map.keySet()) {
+				newMap.put(isLowerCase ? key.toLowerCase():key.toLowerCase(Locale.ROOT), map.get(key));
+			}
+			// 鐢ㄦ柊鐨凪ap鏇挎崲鏃х殑Map
+			dataMapList.set(dataMapList.indexOf(map), newMap);
+		}
+	}
+
 }

--
Gitblit v1.9.3