bug：自定义sql数据集

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);

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;
     }