From c1bd98eccbd6c913f7e358cb7c18b5bbfe749013 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jan 2023 16:33:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=88=9B?= =?UTF-8?q?=E5=BB=BAjoin=E8=AF=AD=E5=8F=A5=E5=8F=82=E6=95=B0=E5=8C=96?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 01fe847d0a..c7244f0ed6 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1119,12 +1119,13 @@ public class DataSetTableService { if (fromItem.getAlias() == null) { throw new Exception("Failed to parse sql, Every derived table must have its own alias!"); } - subSelect.setAlias(new Alias(fromItem.getAlias().toString())); + subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false)); } plainSelect.setFromItem(subSelect); } List joins = plainSelect.getJoins(); if (joins != null) { + List joinsList = new ArrayList<>(); for (Join join : joins) { FromItem rightItem = join.getRightItem(); if (rightItem instanceof SubSelect) { @@ -1139,14 +1140,13 @@ public class DataSetTableService { if (rightItem.getAlias() == null) { throw new Exception("Failed to parse sql, Every derived table must have its own alias!"); } - subSelect.setAlias(new Alias(rightItem.getAlias().toString())); + subSelect.setAlias(new Alias(rightItem.getAlias().toString(), false)); } - List joinsList = new ArrayList<>(); join.setRightItem(subSelect); joinsList.add(join); - plainSelect.setJoins(joinsList); } } + plainSelect.setJoins(joinsList); } Expression expr = plainSelect.getWhere(); if (expr == null) {