From a13255b4129ee8a7a7b7e1ecd8e02dd2c78f7c17 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 16 一月 2025 16:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/utility/UIDataFetcher.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 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..7fefd4e 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
@@ -11,6 +11,7 @@
 import java.util.stream.Collectors;
 
 /**
+ * 鍔犺浇UI涓婁笅鏂�
  * @author ludc
  * @date 2024/10/15 10:32
  */
@@ -27,8 +28,6 @@
 
     //鎸夐挳map
     private Map<String, List<PLTabButton>> buttonMap = new HashMap<String, List<PLTabButton>>();
-
-
 
     public UIDataFetcher() {
         initUIDefination();
@@ -49,16 +48,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