修改bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/YearContrastController.cs

@@ -82,22 +82,17 @@ namespace CallCenterApi.Interface.Controllers.report
         //导出数据
         public ActionResult ExptList(string beginyear, string endyear, string dpt)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
-            //if (Request.IsAuthenticated)
-            if(1==1)
+            NPOIHelper npoi = new NPOIHelper();
+            DataTable dt = GetData(beginyear, endyear, dpt);
+            if (npoi.ExportToExcel("呼叫数据分析数据", dt) == "")
             {
-                NPOIHelper npoi = new NPOIHelper();
-                DataTable dt = GetData(beginyear, endyear, dpt);
-                if (npoi.ExportToExcel("呼叫数据分析数据", dt) == "")
-                {
-                    return Success("导出成功");
-                }
-                else
-                {
-                    return Error("导出失败");
-                }
+                return Success("导出成功");
             }
-            return res;
+            else
+            {
+                return Error("导出失败");
+            }
+
         }
 
         private DataTable GetData(string beginyear, string endyear, string dpt)

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

@@ -16,7 +16,6 @@ namespace CallCenterApi.Interface.Controllers.tel
         //获取号码归属地列表
         public ActionResult GetList(string strtelnum)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 string sql = " and F_IsDelete=0";
@@ -62,27 +61,25 @@ namespace CallCenterApi.Interface.Controllers.tel
                     total = recordCount
                 };
 
-                res = Content(obj.ToJson());
+                return Content(obj.ToJson());
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         public ActionResult GetMobiledata(int id)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 BLL.T_Sys_MobileData dBLL = new BLL.T_Sys_MobileData();
                 Model.T_Sys_MobileData dModel = dBLL.GetModel(id);
-                res = Success("获取号码归属地成功", dModel);
+                return Success("获取号码归属地成功", dModel);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //获取号码归属地
         public ActionResult GetMobiledataByNum(string mobileNum)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
 
@@ -92,26 +89,25 @@ namespace CallCenterApi.Interface.Controllers.tel
                     Model.T_Sys_MobileData dModel = dBLL.GetModelList(" F_MobileNum='" + mobileNum.Trim() + "' ").FirstOrDefault();
                     if (dModel != null)
                     {
-                        res = Success("获取号码归属地成功", dModel);
+                        return Success("获取号码归属地成功", dModel);
                     }
                     else
                     {
-                        res = Error("获取号码归属地失败");
+                        return Error("获取号码归属地失败");
                     }
                 }
                 else
                 {
-                    res = Error("获取参数失败");
+                    return Error("获取参数失败");
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //添加/编辑号码归属地
         public ActionResult AddMobiledata(string mobileNum, string zipCode, string cityDes, string cardDes, int id = 0)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 int userId = CurrentUser.UserData.F_UserId;
@@ -145,16 +141,16 @@ namespace CallCenterApi.Interface.Controllers.tel
                         bool b = dBLL.Update(dModel);
                         if (b)
                         {
-                            res = Success("编辑成功");
+                            return Success("编辑成功");
                         }
                         else
                         {
-                            res = Error("编辑失败");
+                            return Error("编辑失败");
                         }
                     }
                     else
                     {
-                        res = Error("编辑失败");
+                        return Error("编辑失败");
                     }
                 }
                 else
@@ -183,22 +179,21 @@ namespace CallCenterApi.Interface.Controllers.tel
                     int n = new BLL.T_Sys_MobileData().Add(dModel);
                     if (n > 0)
                     {
-                        res = Success("添加成功", n);
+                        return Success("添加成功", n);
                     }
                     else
                     {
-                        res = Error("添加失败");
+                        return Error("添加失败");
                     }
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //删除号码归属地记录
         public ActionResult DelMobiledata(string[] nums)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 int userId = CurrentUser.UserData.F_UserId;
@@ -212,24 +207,23 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                     if (new BLL.T_Sys_MobileData().DeleteList(idd.TrimEnd(','), ua.F_UserCode))
                     {
-                        res = Success("删除成功");
+                        return Success("删除成功");
                     }
                     else
-                        res = Error("删除失败");
+                        return Error("删除失败");
                 }
                 else
                 {
-                    res = Error("请选择要删除的记录");
+                    return Error("请选择要删除的记录");
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         //IVR获取号码归属地
         public ActionResult IVRGetList(string strtelnum)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 string sql = " and isDelete=0";
@@ -274,10 +268,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                     total = recordCount
                 };
 
-                res = Content(obj.ToJson());
+                return Content(obj.ToJson());
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         public ActionResult GetMobileUsersData(int id)
         {
@@ -286,14 +280,13 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 BLL.telloc_users dBLL = new BLL.telloc_users();
                 Model.telloc_users dModel = dBLL.GetModel(id);
-                res = Success("获取号码归属地成功", dModel);
+                return Success("获取号码归属地成功", dModel);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         //获取IVR号码归属地坐席关联
         public ActionResult GetMobileUsersList()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 string sql = " and isDelete=0";
@@ -382,14 +375,13 @@ namespace CallCenterApi.Interface.Controllers.tel
                     total = recordCount
                 };
 
-                res = Content(obj.ToJson());
+                return Content(obj.ToJson());
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         //添加/修改IVR号码归属地坐席关联
         public ActionResult AddMobileUsers(int tellocid, int userid, int type)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 int userId = CurrentUser.UserData.F_UserId;
@@ -442,15 +434,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 //}
 
 
-                dModel = new Model.telloc_users();
-                if (!string.IsNullOrWhiteSpace(tellocid.ToString()))
-                {
-                    dModel.tellocid = tellocid;
-                }
-                if (!string.IsNullOrWhiteSpace(userid.ToString()))
-                {
-                    dModel.userid = userid;
-                }
+
                 dModel = dBLL.GetModel(userid, tellocid);
                 if (dModel != null)
                 {
@@ -459,33 +443,35 @@ namespace CallCenterApi.Interface.Controllers.tel
                     var str = type == 1 ? "解除" : "添加";
                     if (b)
                     {
-                        res = Success(str + "成功");
+                        return Success(str + "成功");
                     }
                     else
                     {
-                        res = Error(str + "失败");
+                        return Error(str + "失败");
                     }
                 }
                 else
                 {
+                    dModel = new Model.telloc_users();
+                    dModel.tellocid = tellocid;
+                    dModel.userid = userid;
                     dModel.isdelete = 0;
                     int n = new BLL.telloc_users().Add(dModel);
                     if (n > 0)
                     {
-                        res = Success("添加成功", n);
+                        return Success("添加成功", n);
                     }
                     else
                     {
-                        res = Error("添加失败");
+                        return Error("添加失败");
                     }
                 }
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
         //删除IVR号码归属地坐席关联
         public ActionResult DeleteMobileUsers(int id)
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 BLL.telloc_users dBLL = new BLL.telloc_users();
@@ -500,37 +486,36 @@ namespace CallCenterApi.Interface.Controllers.tel
                         bool b = dBLL.Update(dModel);
                         if (b)
                         {
-                            res = Success("删除成功");
+                            return Success("删除成功");
                         }
                         else
                         {
-                            res = Error("删除失败");
+                            return Error("删除失败");
                         }
                     }
                     else
                     {
-                        res = Error("删除失败");
+                        return Error("删除失败");
                     }
                 }
                 else
                 {
-                    res = Error("传入参数错误");
+                    return Error("传入参数错误");
                 }
 
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
 
         public ActionResult GetSeatGroup()
         {
-            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 BLL.T_Sys_SeatGroup dBLL = new BLL.T_Sys_SeatGroup();
                 var seatgroups = dBLL.GetModelList("1=1").Select(n => new { n.F_ZXZID, n.F_ZXZName });
-                res = Success("获取坐席组成功", seatgroups);
+                return Success("获取坐席组成功", seatgroups);
             }
-            return res;
+            return NoToken("未知错误，请重新登录");
         }
     }
 }