dyncond.param修改为filter.id

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;
         }