修改导入bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -50,8 +50,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             string sql = "";
             DataTable dt = new DataTable();
             #region 筛选条件
-            if (!string.IsNullOrWhiteSpace(keywords))//关键字搜索
-                sql += $" and F_KeyWords like '%" + keywords.Trim() + "%'";
+            
             if (!string.IsNullOrWhiteSpace(code))//客户编号
                 sql += $" and F_CustomerCode like '%" + code.Trim() + "%'";
             if (!string.IsNullOrWhiteSpace(cmpname))//公司名称
@@ -59,21 +58,12 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (!string.IsNullOrWhiteSpace(cmpaddress))//公司地址
                 sql += $" and (F_CompanyAddress like '%" + cmpaddress.Trim() 
                     + "%')";
-            if (!string.IsNullOrWhiteSpace(legname))//法人姓名
-                sql += $" and F_LegalName like '%" + legname.Trim() + "%'";
+            
             if (!string.IsNullOrWhiteSpace(legtel))//法人电话
                 sql += $" and F_LegalTel like '%" + legtel.Trim() + "%'";
             if (!string.IsNullOrWhiteSpace(custype))//客户类型
                 sql += $" and F_CusType = '" + custype.Trim() + "'";
-            if (!string.IsNullOrWhiteSpace(conname) || !string.IsNullOrWhiteSpace(contel))
-            {
-                var sqlcon = " where F_DeleteFlag=0 ";
-                if (!string.IsNullOrWhiteSpace(conname)) // 联系人
-                    sqlcon += " and F_Name like '%" + conname + "%'";
-                if (!string.IsNullOrWhiteSpace(contel)) //联系人电话
-                    sqlcon += " and F_Telephone like '%" + contel + "%'";
-                sql += $" and F_CustomerId in (select F_CustomerId from T_Cus_ContactPersonNew " + sqlcon + " )";
-            }
+            
             #endregion
 
             int recordCount = 0;
@@ -87,7 +77,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 dt = BLL.PagerBLL.GetListPager(
                     "T_Cus_CustomerBaseNew",
                     "F_CustomerId",
-                    "*,dbo.GetDeptName(F_BeDept) as F_BeDeptName,dbo.GetCusType(F_CusType) as F_CusType",
+                    "*,dbo.GetDeptName(F_BeDept) as F_BeDeptName,dbo.GetCusType(F_CusType) as F_CusTypeName",
                     sql,
                     "ORDER BY F_CustomerId desc",
                     pagesize,
@@ -95,28 +85,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                     true,
                     out recordCount);
                 #region
-                dt.Columns.Add("F_Contact");
-                var dept = new BLL.T_Sys_Department().GetModelList("");
-                foreach (DataRow dr in dt.Rows)
-                {
-                    #region 绑定联系人信息
-                    var contact = "";
-                    string cusid = dr["F_CustomerId"] != null ? dr["F_CustomerId"].ToString() : "";
-                    if (cusid != "")
-                    {
-                        var conlist = conbll.GetModelList(" F_CustomerId=" + cusid);
-                        if (conlist.Count > 0)
-                        {
-                            foreach (var item in conlist)
-                            {
-                                contact += item.F_Name + "(" + item.F_Telephone + "),";
-                            }
-                        }
-                        dr["F_Contact"] = contact.TrimEnd(',');
-                    }
-                    #endregion
-                }
-
+                
                 #endregion
             }
             var obj = new
@@ -846,7 +815,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                         
                         #region  信息对应
                        
-                        cusmodel.F_CustomerCode = dataRow["客户名称"].ToString();
+                        cusmodel.F_CustomerCode = dataRow["客户姓名"].ToString();
                         cusmodel.F_LegalTel = dataRow["客户电话"].ToString();
                         
                         cusmodel.F_CompanyAddress= dataRow["客户地址"].ToString();