省市

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

@@ -545,12 +545,16 @@ namespace CallCenterApi.Interface.Controllers.customer
             {
                 sql += $" and (F_Remark like '%{ model.F_AddressCountry.Trim()}%'";
                 if (!string.IsNullOrWhiteSpace(model.F_AddressCity))//市
-                    sql += $" or F_Remark like '%{model.F_AddressCity.Trim()}%')";
-                else
+                    sql += $" or F_Remark like '%{model.F_AddressCity.Trim()}%'";
+               else  if (!string.IsNullOrWhiteSpace(model.F_AddressProvince))//省
+                    sql += $" or F_Remark like '%{model.F_AddressProvince.Trim()}%'";
+                
                     sql += $")";
             }
             else if (!string.IsNullOrWhiteSpace(model.F_AddressCity))//市
+            {
                 sql += $" and F_Remark like '%{model.F_AddressCity.Trim()}%'";
+            }
             else
                 sql += $" and 1!=1";
             var modelist = new BLL.T_Sys_UserAccount().GetModelList(sql);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1556,10 +1556,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     else
                         sql += $" and F_Source='" + source + "'";
                 }
-                if (!string.IsNullOrWhiteSpace(createby))//创建人
-                {
-                    sql += $" and F_CustomerID  in(select F_CustomerCode from T_Cus_CustomerBaseNew where F_Salesman like '%" + createby + "%' and F_IsDelete =0) ";
-                }
+                //if (!string.IsNullOrWhiteSpace(createby))//创建人
+                //{
+                //    sql += $" and F_CustomerID  in(select F_CustomerCode from T_Cus_CustomerBaseNew where F_Salesman like '%" + createby + "%' and F_IsDelete =0) ";
+                //}
                 if (!string.IsNullOrWhiteSpace(createtel))//创建人
                 {
                     sql += $" and F_CustomerID  in(select F_CustomerCode from T_Cus_CustomerBaseNew where F_SalesPhone like '%" + createtel + "%' and F_IsDelete =0) ";
@@ -1567,7 +1567,38 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (!string.IsNullOrWhiteSpace(description))//问题描述
                     sql += $" and F_Description like '%" + description.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
-                    sql += $" and F_CreateBy like '%" + createby.Trim() + "%'";
+                {
+                    string F_WorkNumber = "";
+                    string UserCode = "";
+                    Model.T_Sys_UserAccount user = userAccountBLL.GetworkModel(createby);
+                    if (user != null)
+                    {
+                        F_WorkNumber = user.F_WorkNumber;
+                        UserCode = user.F_UserCode;
+                    }
+                    else
+                    {
+                        Model.T_Sys_UserAccount username = userAccountBLL.GetName(createby);
+                        if (username != null)
+                        {
+                            F_WorkNumber = username.F_WorkNumber;
+                            UserCode = username.F_UserCode;
+                        }
+                    }
+                    if (!string.IsNullOrEmpty(F_WorkNumber) && !string.IsNullOrEmpty(UserCode))
+                    {
+                        sql += $"and F_CreateBy  in(" + UserCode + "," + F_WorkNumber + ") ";
+                    }
+                    else if (!string.IsNullOrEmpty(F_WorkNumber))
+                    {
+                        sql += $"and F_CreateBy  in(" + F_WorkNumber + ") ";
+                    }
+                    else if (!string.IsNullOrEmpty(UserCode))
+                    {
+                        sql += $"and F_CreateBy  in(" + UserCode + ") ";
+                    }
+
+                }
                 if (!string.IsNullOrWhiteSpace(touser))//参与人
                     sql += $" and F_DealBy like '%" + touser.Trim() + "%'";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号