fgfgvv

.gitignore

@@ -35,3 +35,6 @@ Release/
 *.suo
 *.dll
 *.pdb
+/.vs/slnx.sqlite
+/.vs/VSWorkspaceState.json
+/codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Properties/PublishProfiles/FolderProfile.pubxml

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AreaController.cs

@@ -9,7 +9,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    [Authority]
+    //[Authority]
     public class AreaController : BaseController
     {
         // GET: Area

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RegRecords/RegRecordsController.cs

@@ -9,15 +9,12 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers.RegRecords
 {
-    [Authority]
+    //[Authority]
     public class RegRecordsController : BaseController
     {
         //获取列表
-        public ActionResult GetList(string key,string tel, string starttime,string endtime,string usercode, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10,
-            int innerType=-1 ,string Zsz="")
+        public ActionResult GetList(string key,string tel, string starttime,string endtime, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10)
         {
-            if (!Request.IsAuthenticated)
-                return NoToken("未知错误，请重新登录");
             string sql = "";
             DataTable dt = new DataTable();
             #region 筛选
@@ -34,8 +31,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
                 sql += " and F_Tel like '%" + tel.Trim() + "%' ";
             }
             
-            if (!string.IsNullOrWhiteSpace(usercode))
-                sql += " and F_CreateBy='"+usercode+"'";
+          
             if(type>0)
             {
                 sql += " and F_Type=" + type;
@@ -48,56 +44,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             {
                 sql += " and F_CreateOn < '" + Convert.ToDateTime(endtime.Trim()) + "' ";
             }
-            if (innerType == 0)
-            {
-                //转移
-                if (CurrentUser.UserData.F_DeptId == 1)
-                {
-                    sql += " and(  F_Id in(select F_CustomerId from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 ))";
-                }
-                else
-                {
-                    sql += " and(  F_Id in(select F_CustomerId from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 and F_Bdeptid=" + CurrentUser.UserData.F_DeptId + "))";
-                }
-               
-
-            }
-            else if (innerType == 1)
-            {
-                if (CurrentUser.UserData.F_DeptId == 1)
-                {
-                    sql += " and(  F_Id in(select (	select F_CustomerId from T_Sys_ATheChangeLog where F_Id=F_ATheChangeLog) from T_Sys_BTheChangeLog ) )";
-                    //sql += " and (F_Id in(	select F_CustomerId from T_Sys_ATheChangeLog   ))";
-                }
-                else
-                {
-                    sql += " and(  F_Id in(select (	select F_CustomerId from T_Sys_ATheChangeLog where F_Id=F_ATheChangeLog) from T_Sys_BTheChangeLog  where F_deptid=" + CurrentUser.UserData.F_DeptId + ") )";
-                }
-                //转入
-
-                //已接收非本部门的数据不可看到
-                sql += @" and (
-isnull((
-select  top 1 F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 order by F_Id desc ),0)=
-" + CurrentUser.UserData.F_DeptId + ")";
-               // isnull((
-//select top 1 F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId = T_Rec_RegRecords.F_Id and F_type = 1  order by F_Id desc),0)= 0 or
-
-            }
-            else {
-
-                //已接收非本部门的数据不可看到
-                sql += @" and ((isnull((
-select top 1 F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 order by F_Id desc ),0)=0 and   (  F_ZXZType='" + Zsz + @"') )or
-isnull((
-select top 1 F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 order by F_Id desc ),0)=
-" + CurrentUser.UserData.F_DeptId +
-")";
-                //if (Zsz != "")
-                //{
-                //    sql += " and (  F_ZXZType='" + Zsz + "')";
-                //}
-            }
+ 
            
           
             
@@ -210,14 +157,7 @@ string citizensType, string putRecord,string  zXZType ,int CasePartyId,string Pr
 int id = 0
             )
         {
-            if (!Request.IsAuthenticated)
-                return NoToken("未知错误，请重新登录");
-            int userid = CurrentUser.UserData.F_UserId;
-            if (userid == 0)
-                return Error("用户信息获取失败，请重新登录");
-            Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userid);
-            if (ua == null)
-                return Error("信息获取失败，请重新登录");
+
 
             BLL.T_Rec_RegRecords dBLL = new BLL.T_Rec_RegRecords();
             Model.T_Rec_RegRecords dModel = new Model.T_Rec_RegRecords();
@@ -263,7 +203,7 @@ int id = 0
             else
             {
                 dModel.F_RecCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");
-                dModel.F_CreateBy = ua.F_UserCode;
+                dModel.F_CreateBy = "8000";
                 dModel.F_CreateOn = DateTime.Now;
                 res =dBLL.Add(dModel)>0;
             }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -14,7 +14,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    [Authority]
+    //[Authority]
     public class UserAccountController : BaseController
     {
         private BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
@@ -981,27 +981,26 @@ namespace CallCenterApi.Interface.Controllers
         //获取坐席列表
         public ActionResult GetSeatList()
         {
-            if (!Request.IsAuthenticated)
-                return NoToken("未知错误，请重新登录");
-            int userId = CurrentUser.UserData.F_UserId;
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+   
+            //int userId = CurrentUser.UserData.F_UserId;
+            //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
             string sql = " f_seatflag=1 and F_DeleteFlag=0 ";
-            int roleid = CurrentUser.UserData.F_RoleId;
-            int deptid = CurrentUser.UserData.F_DeptId;
-            if (roleid != 0)
-            {
-                if (roleid != 17)
-                {
-                    if (deptid != 0)
-                        sql += " and F_RoleId=" + 1;
-                }
-            }
+            //int roleid = CurrentUser.UserData.F_RoleId;
+            //int deptid = CurrentUser.UserData.F_DeptId;
+            //if (roleid != 0)
+            //{
+            //    if (roleid != 17)
+            //    {
+            //        if (deptid != 0)
+                        //sql += " and F_RoleId=" + 1;
+            //    }
+            //}
 
-            if (userModel.F_SeartGroupID != 0)
-            {
-                sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
-            }
+            //if (userModel.F_SeartGroupID != 0)
+            //{
+            //    sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
+            //}
 
             List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
             if (userSeartList.Count > 0)

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

@@ -196,14 +196,7 @@ namespace CallCenterApi.Interface.Controllers.tel
         /// <returns></returns>
         public ActionResult GetOldList()
         {
-            if (!Request.IsAuthenticated)
-                return NoToken("未知错误，请重新登录");
-            int userid = CurrentUser.UserData.F_UserId;
-            if (userid == 0)
-                return Error("用户信息获取失败，请重新登录");
-            Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userid);
-            if (ua == null)
-                return Error("信息获取失败，请重新登录");
+         
             string sql = "";
             string sqlcount = "";
             DataTable dt = new DataTable();
@@ -218,21 +211,21 @@ namespace CallCenterApi.Interface.Controllers.tel
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
             #region 2018-05-30 lihai 坐席能看到同组的通话记录
-            int seartGroupId = ua.F_SeartGroupID ?? 0;
-            if (seartGroupId != 0)
-            {
-                //groupcode判断是市场部或客服部的通话记录
-                var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
-                if (modelSeartGroup != null)
-                {
-                    sql += " and groupcode = '" + modelSeartGroup.F_ZXZCode + "' ";
-                }
-            }
-            else
-            {
-                //找不到对应坐席组
-                sql += " and UserCode='" + ua.F_UserCode + "' ";
-            }
+            //int seartGroupId = ua.F_SeartGroupID ?? 0;
+            //if (seartGroupId != 0)
+            //{
+            //    //groupcode判断是市场部或客服部的通话记录
+            //    var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
+            //    if (modelSeartGroup != null)
+            //    {
+            //        sql += " and groupcode = '" + modelSeartGroup.F_ZXZCode + "' ";
+            //    }
+            //}
+            //else
+            //{
+            //    //找不到对应坐席组
+            //    sql += " and UserCode='" + ua.F_UserCode + "' ";
+            //}
             #endregion
 
             if (strcalltype.Trim() != "" && strcalltype != "undefined")