diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java index bb85ceb..9c6177e 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java @@ -7,7 +7,6 @@ import java.util.Map; //一个sql及其参数，具名参数 public class SqlNamedPara extends SqlPara { - public String sql = ""; public SwMap mapParas = new SwMap(); //字段别名 public Map mapFieldAlias = new HashMap<>(); 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 5d774ff..befd9e9 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 @@ -159,6 +159,7 @@ public class DynPageHelper { */ private static String buildDynCondSql(PageDataset dataSet, PageDatasetDynCond dynCond, Map params, SwMap args, Set setFixedFilter) { if (dynCond.isCondOpt()) {//是and/or + if (dynCond.children == null || dynCond.children.isEmpty()) return ""; 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 index 0f766bb..9aea381 100644 --- 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 @@ -52,9 +52,9 @@ public class DynPageListHandler extends AbstractListHandler { List list; SqlNamedPara sp = (SqlNamedPara)sqlPara; if (sqlPara.page > 0 && sqlPara.rows > 0) { - list = DbEngine.getInstance().pagedQueryN(sqlPara.sql, SwMap.class, (sqlPara.page - 1) * sqlPara.rows, sqlPara.rows, sp.mapParas); + list = DbEngine.getInstance().pagedQueryN(sql, SwMap.class, (sqlPara.page - 1) * sqlPara.rows, sqlPara.rows, sp.mapParas); } else { - list = DbEngine.getInstance().queryN(sqlPara.sql, sp.mapParas, SwMap.class); + list = DbEngine.getInstance().queryN(sql, sp.mapParas, SwMap.class); } ModelTable masterTable = ModelTableCache.getInstance().get(pageDataSet.masterTable); EntityHelper.loadBeanLink(masterTable.getName(), list, sp.mapFieldAlias); diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java index 0146067..cf8b067 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageLoadHandler.java @@ -30,7 +30,9 @@ public class DynPageLoadHandler extends AbstractDynPageHandler { //列表工具类 public DynPageListHandler getListWorker(SwMap filter, PageDataset pageDataSet) { - return new DynPageListHandler(pageId, filter, pageDataSet); + DynPageListHandler listHandler = new DynPageListHandler(pageId, filter, pageDataSet); + listHandler.init(params, us); + return listHandler; } //新增操作，初始化定义的数据集 @@ -71,7 +73,7 @@ public class DynPageLoadHandler extends AbstractDynPageHandler { public R loadOne() { //过滤条件 - SwMap filter = (SwMap) params.get("filter"); + SwMap filter = params.readMap("filter"); //对应的数据集定义 PageDataset pageDataSet = readParamDs(); @@ -96,7 +98,7 @@ public class DynPageLoadHandler extends AbstractDynPageHandler { //数据集 PageDataset pageDataSet = readParamDs(); //过滤条件 - SwMap filter = (SwMap) params.get("filter"); + SwMap filter = params.readMap("filter"); return getListWorker(filter, pageDataSet).getTotal(); } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java index 65c1546..f9bd65a 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java @@ -36,7 +36,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler { public R saveOne() { //数据集 String dbName = params.readString("dataset"); - SwMap filter = (SwMap) params.get("filter"); + SwMap filter = params.readMap("filter"); //待保存数据 SwMap data = params.readMap("data"); if (data == null) throw new SwException("没有收到待保存的的数据：" + dbName + "！"); @@ -77,7 +77,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler { public R saveAll() { SwMap data = params.readMap("data"); if (data == null) throw new SwException("没有收到待保存的的数据！"); - SwMap filter = (SwMap) params.get("filter"); + SwMap filter = params.readMap("filter"); Map map = new LinkedHashMap<>(); for (PageDataset pageDataSet : datasets.list) { diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java index dd5b767..4fd3159 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynRetBean.java @@ -2,11 +2,13 @@ package cc.smtweb.system.bpm.web.engine.dynPage; import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.mvc.service.SwListData; +import lombok.Data; /** * Created by Akmm at 2022/4/21 19:26 * 动态页面加载 */ +@Data public class DynRetBean { //单个表单 private SwMap form = null;