Browse Source

dyncond.param修改为filter.id

master
郑根木 2 years ago
parent
commit
dcfb32add4
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java

+ 5
- 5
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java View File

@@ -177,12 +177,12 @@ public class DynPageHelper {
return ""; 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 + ")!"); if (filter == null) throw new SwException("没有找到filter(" + dynCond.param + ")!");


boolean isNameSelf = setFixedFilter.contains(filter.name);
setFixedFilter.remove(filter.name);

Object value = null; Object value = null;
if (SwEnum.FilterType.CONST.value.equals(filter.type)) { if (SwEnum.FilterType.CONST.value.equals(filter.type)) {
value = filter.value; value = filter.value;
@@ -192,7 +192,7 @@ public class DynPageHelper {
} }
if (value == null || StringUtils.isEmpty(value.toString())) { if (value == null || StringUtils.isEmpty(value.toString())) {
if (filter.required) { if (filter.required) {
throw new SwException("过滤条件不能为空(" + dynCond.param + ")!");
throw new SwException("过滤条件不能为空(" + filter.name + ")!");
} }
return null; return null;
} }


Loading…
Cancel
Save