调整

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -63,15 +63,15 @@ namespace CallCenterApi.Interface.Controllers.customer
 
             //搜索
             List<string> customerIdList = new List<string>();
-            DataTable dt1 = null;
+            DataTable dt1 = new DataTable();
             if (!string.IsNullOrWhiteSpace(sb.ToString()))
             {
-                dt1 = DbHelperSQL.Query($"select F_CustomerId FROM T_Cus_CustomerExpand where {sql}  and  {sb.ToString()}").Tables[0];
+                dt1 = DbHelperSQL.Query($"select F_CustomerId FROM T_Cus_CustomerExpand where {sb.ToString()}").Tables[0];
 
             }
             else
             {
-                dt1 = DbHelperSQL.Query($"select F_CustomerId FROM T_Cus_CustomerExpand where {sql}").Tables[0];
+                dt1 = DbHelperSQL.Query($"select F_CustomerId FROM T_Cus_CustomerExpand ").Tables[0];
             }
 
             foreach (DataRow row in dt1.Rows)
@@ -79,16 +79,22 @@ namespace CallCenterApi.Interface.Controllers.customer
                 customerIdList.Add(row["F_CustomerId"].ToString());
             }
             //获取主表数据
-            var customerListAll = customerBaseBLL.DataTableToList(customerBaseBLL.GetList("").Tables[0]);
+            var customerListAll = customerBaseBLL.DataTableToList(customerBaseBLL.GetList(sql).Tables[0]);
             var customerList = customerListAll.Where(x => customerIdList.Contains(x.F_Id))
-                .Skip(filter.PageIndex * filter.PageSize).Take(filter.PageSize).ToList();
+                .Skip((filter.PageIndex - 1) * filter.PageSize).Take(filter.PageSize).ToList();
 
             //获取主表数据ID
             var customerIdArr = customerList.OrderByDescending(x => x.F_AddTime).Select(x => "'" + x.F_Id + "'").ToArray();
-            //根据主表数据ID获取自定义字段数据
-            var customerExpandList = DbHelperSQL.Query($"select F_CustomerId, {string.Join(",", customerColumnArr)} from T_Cus_CustomerExpand where   F_CustomerId IN ({string.Join(",", customerIdArr)}) ").Tables[0];
-
-
+            DataTable customerExpandList = new DataTable();
+            if (customerIdArr.Length > 0)
+            {
+                //根据主表数据ID获取自定义字段数据
+                customerExpandList = DbHelperSQL.Query($"select F_CustomerId, {string.Join(",", customerColumnArr)} from T_Cus_CustomerExpand where   F_CustomerId IN ({string.Join(",", customerIdArr)}) ").Tables[0];
+            }
+            else
+            {
+                customerExpandList = DbHelperSQL.Query("SET FMTONLY ON;SELECT * FROM T_Cus_CustomerExpand ;SET FMTONLY OFF; ").Tables[0];
+            }
             //组织数据
             List<CustomerDto> dataList = new List<CustomerDto>();
             foreach (var c in customerList)
@@ -108,6 +114,13 @@ namespace CallCenterApi.Interface.Controllers.customer
                         strList2.Add(e[0][item].ToString());
                     }
                 }
+                else
+                {
+                    foreach (var item in customerColumnArr)
+                    {
+                        strList2.Add("");
+                    }
+                }
 
                 strList1.AddRange(strList2);
                 model.dataarr = strList1;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterCustomer.cs

@@ -15,8 +15,8 @@ namespace CallCenterApi.Interface.Models.Filter
         public int? CusType { get; set; }
         public string Remark { get; set; }
         public int? YHFKId { get; set; }
-        public string[] Fields { get; set; }
-        public string[] FieldValues { get; set; }
+        public string[] Fields { get; set; } = { };
+        public string[] FieldValues { get; set; } = { };
 
     }
 }