From d27d7e91d7596fc17c2af080b660e64d48c16945 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 28 Feb 2023 15:11:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=BA=94=E7=94=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=90=BA=E5=B8=A6=E5=8D=95=E7=8B=AC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=AE=9A=E4=B9=89=E7=9A=84=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B0=E7=8E=AF=E5=A2=83=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=9A=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20#4620?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/panel/PanelGroupService.java      | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 3aac71fbe5..52ad3447e5 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -932,6 +932,28 @@ public class PanelGroupService {
                     }
                 }
             }
+
+            // 兼容过滤组件使用独立的数据集情况
+            PanelGroupDTO panelGroupInfo = this.findOne(panelId);
+            String panelData = panelGroupInfo.getPanelData();
+            try {
+                if (StringUtils.isNotEmpty(panelData)) {
+                    JSONArray panelDataArray = JSONObject.parseArray(panelData);
+                    for (int i = 0; i < panelDataArray.size(); i++) {
+                        JSONObject element = panelDataArray.getJSONObject(i);
+                        if ("custom".equals(element.getString("type"))) {
+                            JSONObject fieldsParent = element.getJSONObject("options").getJSONObject("attrs").getJSONObject("fieldsParent");
+                            if (ObjectUtils.isNotEmpty(fieldsParent)) {
+                                allTableIds.add(fieldsParent.getString("id"));
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                //ignore
+                LogUtil.warn("custom component dataset id get error");
+            }
+
         }
         datasetTablesInfo = extDataSetTableMapper.findByTableIds(allTableIds);
         //4.获取所有数据集字段信息