修改bug

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

@@ -20,7 +20,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult AddBlack()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -57,11 +57,11 @@ namespace CallCenterApi.Interface.Controllers.tel
                             int b = new BLL.T_Call_Blacklist().Add(dModel);
                             if (b > 0)
                             {
-                                res = Success("添加成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
+                                return Success("添加成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
                             }
                             else
                             {
-                                res = Error("添加失败");
+                                return Error("添加失败");
                             }
                         }
                         else
@@ -70,18 +70,18 @@ namespace CallCenterApi.Interface.Controllers.tel
                             dModel.F_RemoveTime = enddate;
                             if (new BLL.T_Call_Blacklist().Update(dModel))
                             {
-                                res = Success("修改成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
+                                return Success("修改成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
                             }
                             else
                             {
-                                res = Error("修改失败");
+                                return Error("修改失败");
                             }
                         }
                     }
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -90,7 +90,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult DelBlack()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -102,12 +102,12 @@ namespace CallCenterApi.Interface.Controllers.tel
                     bool bl = new BLL.T_Call_Blacklist().Delete(dModel.F_BlackId);
                     if (bl)
                     {
-                        res = Success("取消成功");
+                        return Success("取消成功");
                     }
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -116,7 +116,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetCustomerByTel()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 //DataTable dt = new DataTable();
@@ -125,9 +125,9 @@ namespace CallCenterApi.Interface.Controllers.tel
                 //dt = bll.GetList(" F_Telephone like '%" + tel + "%' or F_Mobile like '%" + tel + "%' ").Tables[0];
                 //20180509 来电弹屏一个号码弹两个客户信息 machenyang
                 var cusmodel = bll.GetModelList(" F_Telephone like '%" + tel + "%' or F_Mobile like '%" + tel + "%' ").Count() == 0 ? null : bll.GetModelList(" F_Telephone like '%" + tel + "%' or F_Mobile like '%" + tel + "%' ").OrderByDescending(p => p.F_CustomerId).First();
-                res = Success("客户信息加载成功", cusmodel);
+                return Success("客户信息加载成功", cusmodel);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -136,7 +136,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetCallIdByPhone()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 DataTable dt = new DataTable();
@@ -144,10 +144,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                 string tel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
                 Model.T_Call_CallRecords model = new BLL.T_Call_CallRecords().GetModelByTelphone(tel);
 
-                res = Success("加载成功", model);
+                return Success("加载成功", model);
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -156,7 +156,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetTelRecordByCallid()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 DataTable dt = new DataTable();
@@ -164,10 +164,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                 string callid = HttpUtility.UrlDecode(RequestString.GetQueryString("callid"));
                 Model.T_Call_CallRecords model = new BLL.T_Call_CallRecords().GetModelByCallId(callid);
 
-                res = Success("通话记录加载成功", model);
+                return Success("通话记录加载成功", model);
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -176,40 +176,67 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetPhoneLocation()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 string location = "未知";
 
                 string tel = HttpUtility.UrlDecode(RequestString.GetQueryString("tel"));
-                if (tel.Trim().Length == 11 && tel.Substring(0, 1) != "0")
+
+                if (tel.Trim().Length == 12)
                 {
                     BLL.T_Sys_MobileData mobile_Bll = new BLL.T_Sys_MobileData();
-                    Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(0, 7) + "' ").FirstOrDefault();
+                    Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(1, 7) + "' ").FirstOrDefault();
 
                     if (mobileModel != null)
                     {
                         location = mobileModel.F_CityDes + mobileModel.F_CardDes;
                     }
+                    else
+                    {
+                        BLL.T_Sys_TelTitleData numbBll = new BLL.T_Sys_TelTitleData();
+                        List<Model.T_Sys_TelTitleData> mobileModel1 = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 4) + "'");
+                        if (mobileModel1 == null || mobileModel1.Count <= 0)
+                        {
+                            mobileModel1 = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 3) + "'");
+                        }
+                        if (mobileModel1.Count > 0)
+                        {
+                            location = mobileModel1[0].F_TitleName;
+                        }
+                    }
                 }
                 else
                 {
-                    BLL.T_Sys_TelTitleData numbBll = new BLL.T_Sys_TelTitleData();
-                    List<Model.T_Sys_TelTitleData> mobileModel = numbBll.GetModelList(" 1=1 and F_KeyPhoneNum='" + tel.Substring(0, 4) + "'");
-                    if (mobileModel == null || mobileModel.Count <= 0)
+                    if (tel.Trim().Length == 11 && tel.Substring(0, 1) != "0")
                     {
-                        mobileModel = numbBll.GetModelList(" 1=1 and F_KeyPhoneNum='" + tel.Substring(0, 3) + "'");
+                        BLL.T_Sys_MobileData mobile_Bll = new BLL.T_Sys_MobileData();
+                        Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(0, 7) + "' ").FirstOrDefault();
+
+                        if (mobileModel != null)
+                        {
+                            location = mobileModel.F_CityDes + mobileModel.F_CardDes;
+                        }
                     }
-                    if (mobileModel.Count > 0)
+                    else
                     {
-                        location = mobileModel[0].F_TitleName;
+                        BLL.T_Sys_TelTitleData numbBll = new BLL.T_Sys_TelTitleData();
+                        List<Model.T_Sys_TelTitleData> mobileModel = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 4) + "'");
+                        if (mobileModel == null || mobileModel.Count <= 0)
+                        {
+                            mobileModel = numbBll.GetModelList(" F_KeyPhoneNum='" + tel.Substring(0, 3) + "'");
+                        }
+                        if (mobileModel.Count > 0)
+                        {
+                            location = mobileModel[0].F_TitleName;
+                        }
                     }
                 }
 
-                res = Success("归属地加载成功", location);
+                return Success("归属地加载成功", location);
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -218,7 +245,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetOldList()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 int userId = CurrentUser.UserData.F_UserId;
@@ -369,11 +396,11 @@ namespace CallCenterApi.Interface.Controllers.tel
                             hrcount = hrcount,
                             hccount = hccount,
                         };
-                        res = Content(obj.ToJson());
+                        return Content(obj.ToJson());
                     }
                 }
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -382,7 +409,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetZSKList()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -403,10 +430,10 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                 dt = new BLL.T_RepositoryInformation().GetList(8, sql, " F_RepositoryId desc").Tables[0];
 
-                res = Success("加载成功", dt);
+                return Success("加载成功", dt);
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -415,7 +442,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult UpdateZL()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -437,18 +464,18 @@ namespace CallCenterApi.Interface.Controllers.tel
                         bool bl = new BLL.T_Call_CallRecords().UpdateCallInRingTelRecord(model);
                         if (bl)
                         {
-                            res = Success("更新振铃状态成功");
+                            return Success("更新振铃状态成功");
                         }
                         else
                         {
-                            // res = Error("更新振铃状态失败");
-                            res = Success("更新振铃状态失败");
+                            // return Error("更新振铃状态失败");
+                            return Success("更新振铃状态失败");
                         }
                     }
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -457,7 +484,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult UpdateZJ()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -475,16 +502,16 @@ namespace CallCenterApi.Interface.Controllers.tel
                         new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
                     }
 
-                    res = Success("更新摘机状态成功");
+                    return Success("更新摘机状态成功");
                 }
                 else
                 {
-                    //res = Error("更新摘机状态失败");
-                    res = Success("更新摘机状态失败");
+                    //return Error("更新摘机状态失败");
+                    return Success("更新摘机状态失败");
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -493,7 +520,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult UpdateGJ()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -501,15 +528,15 @@ namespace CallCenterApi.Interface.Controllers.tel
                 bool bl = new BLL.T_Call_CallRecords().UpdateCallInHookTelRecord(strid);
                 if (bl)
                 {
-                    res = Success("更新挂机状态成功");
+                    return Success("更新挂机状态成功");
                 }
                 else
                 {
-                    res = Success("更新挂机状态失败");
+                    return Success("更新挂机状态失败");
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -518,7 +545,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult UpdateLY()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -537,15 +564,15 @@ namespace CallCenterApi.Interface.Controllers.tel
                         new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
                     }
 
-                    res = Success("更新挂机状态成功");
+                    return Success("更新挂机状态成功");
                 }
                 else
                 {
-                    res = Success("更新挂机状态失败");
+                    return Success("更新挂机状态失败");
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -554,7 +581,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult AddWorkOrder()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
 
@@ -763,7 +790,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                                     F_RelationShipClass = fkdep
                                 });
                                 //if (cusid > 0)
-                                //    res = Success("新增成功！");
+                                //    return Success("新增成功！");
                             }
                             else
                             {
@@ -812,14 +839,14 @@ namespace CallCenterApi.Interface.Controllers.tel
                                     CacheHelper.Insert("LDDep", lddep_cache);
                                 }
                                 else
-                                    res = Error("获取失败，没有对应数据");
+                                    return Error("获取失败，没有对应数据");
                             }
                             #endregion
-                            res = Success("新增成功！");
+                            return Success("新增成功！");
                         }
                         else
                         {
-                            res = Error("新增失败！");
+                            return Error("新增失败！");
                         }
 
                         #region no use
@@ -851,17 +878,17 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                         //if (new BLL.T_Wo_WorkOrderBase().Add(model) > 0)
                         //{
-                        //    res = Success("新增成功！");
+                        //    return Success("新增成功！");
                         //}
                         //else
                         //{
-                        //    res = Error("新增失败！");
+                        //    return Error("新增失败！");
                         //} 
                         #endregion
                     }
                 }
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -870,7 +897,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetCurrUserDep()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 int? groid = CurrentUser.UserData.F_SeartGroupID;
@@ -899,9 +926,9 @@ namespace CallCenterApi.Interface.Controllers.tel
                     groid = groid,
                     groname = groname
                 };
-                res = Success("获取坐席部门成功！", obj);
+                return Success("获取坐席部门成功！", obj);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         /// <summary>
@@ -910,7 +937,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetUsers()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
+            
             if (Request.IsAuthenticated)
             {
                 int depid = CurrentUser.UserData.F_DeptId;
@@ -920,9 +947,9 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     user = list
                 };
-                res = Success("获取坐席成功！", obj);
+                return Success("获取坐席成功！", obj);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
     }
 }