From fc70fbc02bbeda4f93cb5b0bc18b11d314f6e7b7 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 22 May 2023 19:30:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8=E5=85=A8=E9=83=A8=E5=AD=97=E6=AE=B5=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=89=BE=E4=B8=8D=E5=88=B0join=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hswebframework/web/crud/query/QueryAnalyzerImpl.java | 7 +++++++ .../org/hswebframework/web/crud/entity/TestEntity.java | 6 +----- .../web/crud/query/DefaultQueryHelperTest.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzerImpl.java b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzerImpl.java index ced5763ba..97ac7e2fe 100644 --- a/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzerImpl.java +++ b/hsweb-commons/hsweb-commons-crud/src/main/java/org/hswebframework/web/crud/query/QueryAnalyzerImpl.java @@ -257,6 +257,13 @@ class QueryAnalyzerImpl implements FromItemVisitor, SelectItemVisitor, SelectVis public void visit(AllTableColumns allTableColumns) { net.sf.jsqlparser.schema.Table table = allTableColumns.getTable(); + String name = table.getName(); + + if (Objects.equals(select.table.alias, name)) { + putSelectColumns(select.table, select.columnList); + return; + } + QueryAnalyzer.Join join = joins.get(parsePlainName(table.getName())); if (join == null) { diff --git a/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java b/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java index 66a1353c3..b7e942ad3 100644 --- a/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java +++ b/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/entity/TestEntity.java @@ -29,9 +29,5 @@ public class TestEntity extends GenericEntity { @Column private String testName; - @Override - @GeneratedValue(generator = Generators.DEFAULT_ID_GENERATOR) - public String getId() { - return super.getId(); - } + } diff --git a/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/query/DefaultQueryHelperTest.java b/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/query/DefaultQueryHelperTest.java index 17b35c681..c19421722 100644 --- a/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/query/DefaultQueryHelperTest.java +++ b/hsweb-commons/hsweb-commons-crud/src/test/java/org/hswebframework/web/crud/query/DefaultQueryHelperTest.java @@ -85,7 +85,7 @@ class DefaultQueryHelperTest { } - helper.select("select e.*,t.id as \"id\" from s_test t " + + helper.select("select e.*,t.* from s_test t " + "left join s_test_event e on e.id = t.id " + "where t.age = ?", 20) .logger(LoggerFactory.getLogger("org.hswebframework.test.native"))