From e96322043649fdc8fc02d886ac19cf8342a43248 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期一, 04 十一月 2024 11:37:13 +0800
Subject: [PATCH] 在登录时判断用户密码过期需要修改时，由于还未登录去获取当前Session的用户时，是null，所以导致报错，增加如果为空，直接使用界面传的用户。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java
index a3c0088..c889347 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java
@@ -49,16 +49,27 @@
//long e = System.currentTimeMillis();
//System.out.println(allContext.length + " 1: " + (e - s));
//s = System.currentTimeMillis();
- List<PLUILayout> contextList = null;
+ List<PLUILayout> relatedTypeList = null;
+ //List<PLUILayout> contextList = null;
for (PLUILayout context : allContext) {
if (contextMap.get(context.plRelatedType) == null) {
- contextList = new ArrayList<PLUILayout>();
- contextMap.put(context.plRelatedType, contextList);
+ relatedTypeList = new ArrayList<>();
+ contextMap.put(context.plRelatedType, relatedTypeList);
} else {
- contextList = contextMap.get(context.plRelatedType);
+ relatedTypeList = contextMap.get(context.plRelatedType);
}
- contextList.add(context);
+ relatedTypeList.add(context);
+ //澶勭悊btmName+context鏂瑰紡瀛樼殑鏁版嵁
+ /*if(contextMap.get(context.plRelatedType + "-" + context.plOId) == null){
+ contextList = new ArrayList<>();
+ contextMap.put(context.plRelatedType + "-" + context.plOId,contextList);
+ }else{
+ contextList = contextMap.get(context.plRelatedType + "-" + context.plOId);
+ }
+ contextList.add(context);*/
}
+
+
//e = System.currentTimeMillis();
//System.out.println("2: " + (e - s));
//鍒濆鍖栨墍鏈夌殑椤电
--
Gitblit v1.9.3