|
|
@@ -77,7 +77,16 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
|
|
77
|
77
|
#region 条件筛选
|
|
78
|
78
|
if (state == 1)
|
|
79
|
79
|
{
|
|
80
|
|
- conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = state.ToString() });
|
|
|
80
|
+ //conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = state.ToString() });
|
|
|
81
|
+ conModels.Add(new ConditionalCollections()
|
|
|
82
|
+ {
|
|
|
83
|
+ ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
|
|
|
84
|
+ {
|
|
|
85
|
+ new KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "0" }),
|
|
|
86
|
+ new KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = "1" })
|
|
|
87
|
+
|
|
|
88
|
+ }
|
|
|
89
|
+ });
|
|
81
|
90
|
}
|
|
82
|
91
|
else if (state == 2)
|
|
83
|
92
|
{
|