Merge branch 'fix/statement_filter' into 'develop'

Merge of fix/statement_filter 修复查询语句一个条件多个值的问题 to master

See merge request o2oa/o2oa!302

(cherry picked from commit 51972676)

6e3d02c2 修复查询语句一个条件多次判断的问题
29b1dcb3 修复查询语句一个条件多个值的问题

o2web/source/x_component_query_Query/Statement.js

@@ -158,7 +158,15 @@ MWF.xApplication.query.Query.Statement = MWF.QStatement = new Class({
         debugger;
         this.filterList = [];
         (data.filterList || []).each(function (d) {
-            var parameterName = d.path.replace(/\./g, "_");
+            var pName = d.path.replace(/\./g, "_");
+
+            var parameterName = pName;
+            var suffix = 1;
+            while( this.parameter[parameterName] ){
+                parameterName = pName + "_" + suffix;
+                suffix++;
+            }
+
             var value = d.value;
             // if( d.code && d.code.code ){
             //     value = this.Macro.exec( d.code.code, this);