From dcfb32add4620079b878d10431ca5557d12534aa Mon Sep 17 00:00:00 2001 From: zhenggm Date: Thu, 16 Jun 2022 18:11:58 +0800 Subject: [PATCH] =?UTF-8?q?dyncond.param=E4=BF=AE=E6=94=B9=E4=B8=BAfilter.?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 cce2438..86b1e1e 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 @@ -177,12 +177,12 @@ public class DynPageHelper { return ""; } - boolean isNameSelf = setFixedFilter.contains(dynCond.param); - setFixedFilter.remove(dynCond.param); - - PageDatasetFilter filter = dataSet.findFilterByName(dynCond.param); + PageDatasetFilter filter = dataSet.findFilterById(dynCond.param); if (filter == null) throw new SwException("没有找到filter（" + dynCond.param + "）！"); + boolean isNameSelf = setFixedFilter.contains(filter.name); + setFixedFilter.remove(filter.name); + Object value = null; if (SwEnum.FilterType.CONST.value.equals(filter.type)) { value = filter.value; @@ -192,7 +192,7 @@ public class DynPageHelper { } if (value == null || StringUtils.isEmpty(value.toString())) { if (filter.required) { - throw new SwException("过滤条件不能为空（" + dynCond.param + "）！"); + throw new SwException("过滤条件不能为空（" + filter.name + "）！"); } return null; }