From fa30fc79866495c5a8442b5c255db92053ae3eda Mon Sep 17 00:00:00 2001 From: tanghp <1035748121@qq.com> Date: Tue, 5 Jul 2022 22:56:54 +0800 Subject: [PATCH] =?UTF-8?q?bug=EF=BC=9A=E8=87=AA=E5=AE=9A=E4=B9=89sql?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java | 2 +- .../smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java index 18f934e..8bf3342 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java @@ -93,7 +93,7 @@ public class DynPageHelper { //主表 ModelTable masterTable = ModelTableCache.getInstance().get(dataSet.masterTable); //非查询列表，或sql为空，则自己组装select sql - if (!SwEnum.DatasetType.LIST.equals(dataSet.type) || StringUtils.isEmpty(dataSet.sql)) { + if (!SwEnum.DatasetType.LIST.value.equals(dataSet.type) || StringUtils.isEmpty(dataSet.sql)) { sql.append("select "); for (PageDatasetField field : dataSet.fields) { sql.append(field.field); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java index 2d5078a..747f339 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java @@ -56,8 +56,11 @@ public class DynPageListHandler extends AbstractListHandler { } else { list = DbEngine.getInstance().queryN(sql, sp.mapParas, SwMap.class); } - ModelTable masterTable = ModelTableCache.getInstance().get(pageDataSet.masterTable); - EntityHelper.loadBeanLink(masterTable.getName(), list, sp.mapFieldAlias); + if(pageDataSet.masterTable != 0 && pageDataSet.masterTable != -1){ + ModelTable masterTable = ModelTableCache.getInstance().get(pageDataSet.masterTable); + EntityHelper.loadBeanLink(masterTable.getName(), list, sp.mapFieldAlias); + } + return list; }