调整地区接口

代码/TVShoppingCallCenter_ZLJ/Controllers/Traffic/SetAreaController.cs

@@ -95,16 +95,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Traffic
 
             if (level > 0)
                 conModels.Add(new ConditionalModel() { FieldName = "F_Level", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = level.ToString() });
-            #endregion
 
-            var list_ModuleInfo = await _sys_areaRepository.GetListALL(conModels, "F_Code asc");
-            
             if (!string.IsNullOrEmpty(keyword))
             {
-                list_ModuleInfo = list_ModuleInfo.ToList().TreeWhere(t => t.F_AreaName.Contains(keyword) || t.F_Code.StartsWith(keyword) || t.F_Code=="0", "F_Id", "F_ParentId").ToList();
+                conModels.Add(new ConditionalCollections()
+                {
+                    ConditionalList = new List<KeyValuePair<WhereType, ConditionalModel>>()
+                    {
+                        new  KeyValuePair<WhereType, ConditionalModel>(WhereType.And, new ConditionalModel() { FieldName = "F_Code", ConditionalType = ConditionalType.LikeLeft, FieldValue = keyword }),
+                        new  KeyValuePair<WhereType, ConditionalModel>( WhereType.Or , new ConditionalModel() { FieldName = "F_Code", ConditionalType = ConditionalType.Equal, FieldValue = "0" })
+                    }
+                });
             }
-            list_ModuleInfo = list_ModuleInfo.OrderBy(x => x.F_Sort).ThenByDescending(x => x.F_LastModifyOn).ToList();//排序
+            #endregion
 
+            var list_ModuleInfo = await _sys_areaRepository.GetListALL(conModels, "F_Code asc");
+            
             var treeList = new List<TreeGridModel>();
             foreach (var item in list_ModuleInfo)
             {