|
|
@@ -126,9 +126,10 @@ namespace Util
|
|
|
condi += val;
|
|
|
}
|
|
|
}
|
|
|
- else if(fieldQueryKind == "4") //数组匹配
|
|
|
+ else if(fieldQueryKind == "5" || fieldQueryKind == "6") //数组匹配/排除
|
|
|
{
|
|
|
- condi += " and " + fieldEnName + " in (";
|
|
|
+ if(fieldQueryKind == "5") condi += " and " + fieldEnName + " in (";
|
|
|
+ else if(fieldQueryKind == "6") condi += " and " + fieldEnName + " not in (";
|
|
|
string val = "";
|
|
|
string[] valList = fieldQueryValue.Split(',');
|
|
|
if(fieldQueryModel == "request_param")
|
|
|
@@ -286,9 +287,10 @@ namespace Util
|
|
|
}
|
|
|
condi += val;
|
|
|
}
|
|
|
- else if(fieldQueryKind == "4") //数组匹配
|
|
|
+ else if(fieldQueryKind == "5" || fieldQueryKind == "6") //数组匹配/排除
|
|
|
{
|
|
|
- condi += " and " + fieldEnName + " in (";
|
|
|
+ if(fieldQueryKind == "5") condi += " and " + fieldEnName + " in (";
|
|
|
+ else if(fieldQueryKind == "6") condi += " and " + fieldEnName + " not in (";
|
|
|
string val = "";
|
|
|
string[] valList = fieldQueryValue.Split(',');
|
|
|
if(fieldQueryModel == "request_param")
|
|
|
@@ -657,9 +659,10 @@ namespace Util
|
|
|
}
|
|
|
condi += val;
|
|
|
}
|
|
|
- else if(fieldQueryKind == "4") //数组匹配
|
|
|
+ else if(fieldQueryKind == "5" || fieldQueryKind == "6") //数组匹配/排除
|
|
|
{
|
|
|
- condi += " and " + fieldEnName + " in (";
|
|
|
+ if(fieldQueryKind == "5") condi += " and " + fieldEnName + " in (";
|
|
|
+ else if(fieldQueryKind == "6") condi += " and " + fieldEnName + " not in (";
|
|
|
string val = "";
|
|
|
string[] valList = fieldQueryValue.Split(',');
|
|
|
if(fieldQueryModel == "request_param")
|
|
|
@@ -835,9 +838,10 @@ namespace Util
|
|
|
}
|
|
|
condi += val;
|
|
|
}
|
|
|
- else if(fieldQueryKind == "4") //数组匹配
|
|
|
+ else if(fieldQueryKind == "5" || fieldQueryKind == "6") //数组匹配/排除
|
|
|
{
|
|
|
- condi += " and " + fieldEnName + " in (";
|
|
|
+ if(fieldQueryKind == "5") condi += " and " + fieldEnName + " in (";
|
|
|
+ else if(fieldQueryKind == "6") condi += " and " + fieldEnName + " not in (";
|
|
|
string val = "";
|
|
|
string[] valList = fieldQueryValue.Split(',');
|
|
|
if(fieldQueryModel == "request_param")
|
