diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java index a719d72..14c7b46 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java @@ -78,6 +78,7 @@ public abstract class AbstractListHandler extends AbstractHandler { return R.success(SwListData.create(listData, rows)); } + protected SqlPara buildSumSqlPara() { SqlPara sqlPara = getCache(KEY_SQLPARA); if (sqlPara == null) return null; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java index 0cadf02..c220623 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java @@ -103,7 +103,7 @@ public class ModelFormHelper { } //必填字段 - if (pdf.isNotNull() == MapUtil.readBool(field, "required")) { + if (pdf.isFieldNotNull() == MapUtil.readBool(field, "required")) { field.remove("required"); } @@ -202,7 +202,7 @@ public class ModelFormHelper { } //必填字段 if (!field.containsKey("required")) { - field.put("required", pdf.isNotNull()); + field.put("required", pdf.isFieldNotNull()); } if (!field.containsKey("maxlength")) { diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java index 9c0b7e2..16efb8e 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetDynCond.java @@ -19,7 +19,7 @@ public class PageDatasetDynCond { } @JsonIgnore - public boolean isOpt() { + public boolean isCondOpt() { return StringUtils.isEmpty(param); } } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java index 36f35cb..dcb67d7 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDatasetField.java @@ -36,7 +36,7 @@ public class PageDatasetField { public String editor; @JsonIgnore - public boolean isNotNull() { + public boolean isFieldNotNull() { return notNull == 1; } } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java index 04bbee1..5d774ff 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java @@ -158,7 +158,7 @@ public class DynPageHelper { * @return */ private static String buildDynCondSql(PageDataset dataSet, PageDatasetDynCond dynCond, Map params, SwMap args, Set setFixedFilter) { - if (dynCond.isOpt()) {//是and/or + if (dynCond.isCondOpt()) {//是and/or StringBuilder sql = new StringBuilder(256); boolean b = false; //递归调用 diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java new file mode 100644 index 0000000..1d58abb --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageListHandler.java @@ -0,0 +1,14 @@ +package cc.smtweb.system.bpm.web.engine.dynPage; + +import cc.smtweb.framework.core.mvc.service.AbstractListHandler; +import cc.smtweb.framework.core.mvc.service.SqlPara; + +/** + * Created by Akmm at 2022/5/26 15:58 + */ +public class DynPageListHandler extends AbstractListHandler { + @Override + protected SqlPara buildSqlPara() { + return null; + } +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadOneHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadOneHandler.java index 9d10b26..121d6ac 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadOneHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadOneHandler.java @@ -28,7 +28,7 @@ public class DynPageLoadOneHandler extends AbstractDynPageHandler { //对应的数据集定义 private PageDataset pageDataSet; - public R load() throws Exception { + public R load() { dbName = params.readString("dataset"); filter = (SwMap)params.get("filter");