Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/XinXiangXLX_API

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/CusRegionCategoryController.cs

                 return Error("区域名称不能为空");
             var model = bllCus_Region.GetModel(input.F_RegionId);
             if (model == null)
-                return Error("字典对象不存在");
+                return Error("字典标志不要修改");   //字典对象不存在
             model.F_RegionName = input.F_RegionName;
             model.F_City = input.F_City;
             model.F_Property = input.F_Property;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

                 BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
                 Model.T_Sys_DictionaryBase orderModel = orderBll.GetModel(input.DicFlag.Trim());
                 if (orderModel == null)
-                    return Error("字典对象不存在");
+                    return Error("字典标志不要修改");   //字典对象不存在
                 orderModel.F_DictionaryFlag = input.DicFlag;
                 orderModel.F_DictionaryName = input.Name;
                 orderModel.F_Describe = input.Remark;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

                 if (!string.IsNullOrEmpty(endtime))
                     sql += " and datediff(day,RecvTime,'" + endtime + "')>=0   ";
                 if (!string.IsNullOrEmpty(phone))
-                    sql += " and CallerNum= "+ phone;
+                    sql += " and CallerNum= '" + phone + "'";
                 
                 int recordCount = 0;
                 dt = BLL.PagerBLL.GetListPager(

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SeatGroupController.cs

             string sql = "";
             if (strcontent!=null&&strcontent != "")
             {
-                sql = " and( F_ZXZCode like '" + strcontent + "' or F_ZXZName  like '" + strcontent + "'  or F_WHBDKey like '" + strcontent + "%'  or F_WHWDKey  like '" + strcontent + "%'  or F_ZXAtt like '" + strcontent + "'  or F_Des like '" + strcontent + "')";
+                sql = " and( F_ZXZCode like '" + strcontent + "' or F_ZXZName  like '%" + strcontent + "%'  or F_WHBDKey like '" + strcontent + "%'  or F_WHWDKey  like '" + strcontent + "%'  or F_ZXAtt like '" + strcontent + "'  or F_Des like '" + strcontent + "')";
             }
                 if (strpageindex.Trim() != "")
                 {

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

                 if (getunique(0, input.F_CustomerCode))
                     return Error("编号已被占用，请重新输入！");
             }
-            if (string.IsNullOrEmpty(input.F_LegalPhone))
+            if (string.IsNullOrEmpty(input.F_LegalPhone.Trim()))
                 return Error("请输入客户电话");
-            if (getunphone(0, input.F_LegalPhone))
+            if (getunphone(0, input.F_LegalPhone.Trim()))
                 return Error("已存在该客户请勿重复添加");
             int i = 0;
             if (string.IsNullOrEmpty(input.F_CustomerCode))
                     Input1.F_Channel = model[i].F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
                     Input1.F_Credit = model[i].F_Credit;//信用等级:一星、二星、三星、四星、五星、空
                     Input1.F_Legal = model[i].F_Legal;//法人 
-                    Input1.F_LegalPhone = model[i].F_LegalPhone;//法人电话
+                    Input1.F_LegalPhone = model[i].F_LegalPhone.Trim();//法人电话
                     Input1.F_AddressProvince = model[i].F_AddressProvince;//省
                     Input1.F_AddressCity = model[i].F_AddressCity;//市
                     Input1.F_AddressCountry = model[i].F_AddressCountry;//县
             model.F_Channel = input.F_Channel;// 渠道类型:总经销、二级商、种田大户、农户、化工客户、公司员工
             model.F_Credit = input.F_Credit;//信用等级:一星、二星、三星、四星、五星、空
             model.F_Legal = input.F_Legal;//法人 
-            model.F_LegalPhone = input.F_LegalPhone;//法人电话
+            model.F_LegalPhone = input.F_LegalPhone.Trim();//法人电话
             model.F_AddressProvince = input.F_AddressProvince;//省
             model.F_AddressCity = input.F_AddressCity;//市
             model.F_AddressCountry = input.F_AddressCountry;//县
         private bool getunphone(int id, string phone)
         {
             var sql = " F_IsDelete=0 ";
-            sql += "and (F_LegalPhone='" + phone + "')";
+            sql += "and (F_LegalPhone='" + phone.Trim() + "')";
             if (id > 0)
                 sql += " and F_CustomerId<>" + id;
             var count = cusbll.GetModelList(sql).Count();
                                             dModel.F_Gender = "1";
                                         }
                                     }
-                                    dModel.F_LegalPhone = dr["客户电话"].ToString();
+                                    dModel.F_LegalPhone = dr["客户电话"].ToString().Trim();
                                     dModel.F_AddressProvince = dr["省"].ToString();
                                     dModel.F_AddressCity = dr["市"].ToString();
                                     dModel.F_AddressCountry = dr["县"].ToString();
                                                 CustomerBase.F_Gender = "1";
                                             }
                                         }
-                                        CustomerBase.F_LegalPhone = dr["客户电话"].ToString();
+                                        CustomerBase.F_LegalPhone = dr["客户电话"].ToString().Trim();
                                         CustomerBase.F_AddressProvince = dr["省"].ToString();
                                         CustomerBase.F_AddressCity = dr["市"].ToString();
                                         CustomerBase.F_AddressCountry = dr["县"].ToString();

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallleaveController.cs

                         {
                             dr["F_RecFileUrl"] = config.F_ParamValue + path;
                         }
-                       
-                      var prono =dr["F_Phone"].ToString().Substring(0, 7);
+
+                    var phone = dr["F_Phone"].ToString();
+                    var prono = phone.Trim().Length >= 7 ? dr["F_Phone"].ToString().Substring(0, 7) : dr["F_Phone"].ToString();
                     var MobileData = new BLL.T_Sys_MobileData().GetModelList("F_MobileNum='"+ prono+"'").FirstOrDefault ();
                     if (MobileData != null)
                         dr["F_Remark"] = MobileData.F_CityDes;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

                 }
                 if (!string.IsNullOrEmpty(tephone))
                 {
-                    Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
-         .FirstOrDefault();
-                    Model.T_Cus_CustomerBaseNew cusll = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='0" + tephone + "'  ")
-        .FirstOrDefault();
+                    //12:08 2020/2/27 过滤字段F_LegalPhone字段中的空格
+                    Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='" + tephone + "'  ").FirstOrDefault();
+                    Model.T_Cus_CustomerBaseNew cusll = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='0" + tephone + "'  ").FirstOrDefault();
                     if (cus != null)
                     {
-                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='" + tephone + "'  ")
-               .FirstOrDefault().F_Legal;
+                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='" + tephone + "'  ").FirstOrDefault().F_Legal;
                     }
                     else if (cusll!=null )
                     {
-                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_LegalPhone ='0" + tephone + "'  ")
-               .FirstOrDefault().F_Legal;
+                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='0" + tephone + "'  ").FirstOrDefault().F_Legal;
                     }
                 }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

                 if (source > 0)//工单来源
                 {
                     if (source==1)
-                        sql += $"( and F_Source in (1,'') or F_Source is null)";
+                        sql += $" and (F_Source in (1,'') or F_Source is null)";
                     else 
                     sql += $" and F_Source='" + source + "'";
                 }
                     }
                     if (!string.IsNullOrEmpty(F_WorkNumber))
                     {
-                        sql += $"and F_CreateBy  in(" + createby + "," + F_WorkNumber + ") ";
+                        sql += $" and F_CreateBy  in('" + createby + "','" + F_WorkNumber + "') ";
                     }
                     else
                     {
-                        sql += $"and F_CreateBy  in(" + createby + ") ";
+                        sql += $" and F_CreateBy  in('" + createby + "') ";
                     }
 
                 }