Merged

smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java

@@ -94,13 +94,13 @@ public class DynPageHelper {
         sqlNamedPara.sql = sql.toString() + " from (" + sqlNamedPara.sql + ") xxxxa";
         return sqlNamedPara;
     }
-
+                                                         
     private static String buildSelFieldsSql(PageDataset dataSet, SqlNamedPara sqlNamedPara) {
         StringBuilder sql = new StringBuilder(512);
         //主表
         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) {
                 if (field.fieldIsCalc()) continue;

smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java

@@ -57,8 +57,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);
+        }
+
         for (SwMap map: list) {
             DynPageHelper.setCalcFields(map, pageDataSet);
         }