From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
index b6a2dcd..c6a3d65 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
@@ -1,6 +1,8 @@
 package com.vci.query;
 
+import com.alibaba.fastjson.JSON;
 import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.web.util.Func;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -59,7 +61,21 @@
     }
 
     public void setSourceData(Map<String, Object> sourceData) {
-        this.sourceData = sourceData;
+        // TODO: 2024/12/2 Ludc 鐣岄潰浼犺繃鏉ョ殑Map鐨剉alue鍙兘鏄竴涓狹ap锛屾墍浠ュ皾璇曡浆鎹�
+        Map<String, Object> convertMap = new HashMap<>();
+        sourceData.keySet().stream().forEach(key->{
+            Object obj = sourceData.get(key);
+            try {
+                if(Func.isNotEmpty(obj)){
+                    convertMap.put(key,JSON.parseObject(obj.toString(), HashMap.class));
+                }
+            }catch (Exception e){
+                //涓嶆姏鍑哄紓甯革紝濡傛灉杞殑鏃跺�欐姤閿欏氨浠h〃鏄疭tring:String绫诲瀷锛岀洿鎺ュ線Map閲岄潰鏀�
+                convertMap.put(key,obj);
+                //e.printStackTrace();
+            }
+        });
+        this.sourceData = convertMap;
     }
 
     public List<Map<String, String>> getSelectData() {

--
Gitblit v1.9.3