From 2724c3c17268f2f8732072a69a15708087072770 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 16 May 2024 14:41:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=A4=87=E9=80=89=E9=A1=B9=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BC=A0=E5=8F=82=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/engine/sql/SQLProvider.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java b/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java index c2fa39f1d3..a5ea329019 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java +++ b/core/core-backend/src/main/java/io/dataease/engine/sql/SQLProvider.java @@ -45,9 +45,11 @@ public class SQLProvider { if (ObjectUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields); if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj); String customWheres = sqlMeta.getCustomWheres(); + String extWheres = sqlMeta.getExtWheres(); String whereTrees = sqlMeta.getWhereTrees(); List wheres = new ArrayList<>(); if (customWheres != null) wheres.add(customWheres); + if (extWheres != null) wheres.add(extWheres); if (whereTrees != null) wheres.add(whereTrees); if (ObjectUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);