liyuanyuan %!s(int64=4) %!d(string=před) roky
rodič
revize
b6ec47715d

+ 3 - 0
.gitignore

35
 *.suo
35
 *.suo
36
 *.dll
36
 *.dll
37
 *.pdb
37
 *.pdb
38
+/.vs/slnx.sqlite
39
+/.vs/VSWorkspaceState.json
40
+/codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Properties/PublishProfiles/FolderProfile.pubxml

+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/AreaController.cs

9
 
9
 
10
 namespace CallCenterApi.Interface.Controllers
10
 namespace CallCenterApi.Interface.Controllers
11
 {
11
 {
12
-    [Authority]
12
+    //[Authority]
13
     public class AreaController : BaseController
13
     public class AreaController : BaseController
14
     {
14
     {
15
         // GET: Area
15
         // GET: Area

+ 6 - 66
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RegRecords/RegRecordsController.cs

9
 
9
 
10
 namespace CallCenterApi.Interface.Controllers.RegRecords
10
 namespace CallCenterApi.Interface.Controllers.RegRecords
11
 {
11
 {
12
-    [Authority]
12
+    //[Authority]
13
     public class RegRecordsController : BaseController
13
     public class RegRecordsController : BaseController
14
     {
14
     {
15
         //获取列表
15
         //获取列表
16
-        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,
17
-            int innerType=-1 ,string Zsz="")
16
+        public ActionResult GetList(string key,string tel, string starttime,string endtime, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10)
18
         {
17
         {
19
-            if (!Request.IsAuthenticated)
20
-                return NoToken("未知错误,请重新登录");
21
             string sql = "";
18
             string sql = "";
22
             DataTable dt = new DataTable();
19
             DataTable dt = new DataTable();
23
             #region 筛选
20
             #region 筛选
34
                 sql += " and F_Tel like '%" + tel.Trim() + "%' ";
31
                 sql += " and F_Tel like '%" + tel.Trim() + "%' ";
35
             }
32
             }
36
             
33
             
37
-            if (!string.IsNullOrWhiteSpace(usercode))
38
-                sql += " and F_CreateBy='"+usercode+"'";
34
+          
39
             if(type>0)
35
             if(type>0)
40
             {
36
             {
41
                 sql += " and F_Type=" + type;
37
                 sql += " and F_Type=" + type;
48
             {
44
             {
49
                 sql += " and F_CreateOn < '" + Convert.ToDateTime(endtime.Trim()) + "' ";
45
                 sql += " and F_CreateOn < '" + Convert.ToDateTime(endtime.Trim()) + "' ";
50
             }
46
             }
51
-            if (innerType == 0)
52
-            {
53
-                //转移
54
-                if (CurrentUser.UserData.F_DeptId == 1)
55
-                {
56
-                    sql += " and(  F_Id in(select F_CustomerId from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 ))";
57
-                }
58
-                else
59
-                {
60
-                    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 + "))";
61
-                }
62
-               
63
-
64
-            }
65
-            else if (innerType == 1)
66
-            {
67
-                if (CurrentUser.UserData.F_DeptId == 1)
68
-                {
69
-                    sql += " and(  F_Id in(select (	select F_CustomerId from T_Sys_ATheChangeLog where F_Id=F_ATheChangeLog) from T_Sys_BTheChangeLog ) )";
70
-                    //sql += " and (F_Id in(	select F_CustomerId from T_Sys_ATheChangeLog   ))";
71
-                }
72
-                else
73
-                {
74
-                    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 + ") )";
75
-                }
76
-                //转入
77
-
78
-                //已接收非本部门的数据不可看到
79
-                sql += @" and (
80
-isnull((
81
-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)=
82
-" + CurrentUser.UserData.F_DeptId + ")";
83
-               // isnull((
84
-//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
85
-
86
-            }
87
-            else {
88
-
89
-                //已接收非本部门的数据不可看到
90
-                sql += @" and ((isnull((
91
-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
92
-isnull((
93
-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)=
94
-" + CurrentUser.UserData.F_DeptId +
95
-")";
96
-                //if (Zsz != "")
97
-                //{
98
-                //    sql += " and (  F_ZXZType='" + Zsz + "')";
99
-                //}
100
-            }
47
+ 
101
            
48
            
102
           
49
           
103
             
50
             
210
 int id = 0
157
 int id = 0
211
             )
158
             )
212
         {
159
         {
213
-            if (!Request.IsAuthenticated)
214
-                return NoToken("未知错误,请重新登录");
215
-            int userid = CurrentUser.UserData.F_UserId;
216
-            if (userid == 0)
217
-                return Error("用户信息获取失败,请重新登录");
218
-            Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userid);
219
-            if (ua == null)
220
-                return Error("信息获取失败,请重新登录");
160
+
221
 
161
 
222
             BLL.T_Rec_RegRecords dBLL = new BLL.T_Rec_RegRecords();
162
             BLL.T_Rec_RegRecords dBLL = new BLL.T_Rec_RegRecords();
223
             Model.T_Rec_RegRecords dModel = new Model.T_Rec_RegRecords();
163
             Model.T_Rec_RegRecords dModel = new Model.T_Rec_RegRecords();
263
             else
203
             else
264
             {
204
             {
265
                 dModel.F_RecCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");
205
                 dModel.F_RecCode = DateTime.Now.ToString("yyyyMMddHHmmssfff");
266
-                dModel.F_CreateBy = ua.F_UserCode;
206
+                dModel.F_CreateBy = "8000";
267
                 dModel.F_CreateOn = DateTime.Now;
207
                 dModel.F_CreateOn = DateTime.Now;
268
                 res =dBLL.Add(dModel)>0;
208
                 res =dBLL.Add(dModel)>0;
269
             }
209
             }

+ 18 - 19
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

14
 
14
 
15
 namespace CallCenterApi.Interface.Controllers
15
 namespace CallCenterApi.Interface.Controllers
16
 {
16
 {
17
-    [Authority]
17
+    //[Authority]
18
     public class UserAccountController : BaseController
18
     public class UserAccountController : BaseController
19
     {
19
     {
20
         private BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
20
         private BLL.T_Sys_UserAccount sysUserAccountBll = new BLL.T_Sys_UserAccount();
981
         //获取坐席列表
981
         //获取坐席列表
982
         public ActionResult GetSeatList()
982
         public ActionResult GetSeatList()
983
         {
983
         {
984
-            if (!Request.IsAuthenticated)
985
-                return NoToken("未知错误,请重新登录");
986
-            int userId = CurrentUser.UserData.F_UserId;
987
-            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
984
+   
985
+            //int userId = CurrentUser.UserData.F_UserId;
986
+            //Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
988
 
987
 
989
             string sql = " f_seatflag=1 and F_DeleteFlag=0 ";
988
             string sql = " f_seatflag=1 and F_DeleteFlag=0 ";
990
-            int roleid = CurrentUser.UserData.F_RoleId;
991
-            int deptid = CurrentUser.UserData.F_DeptId;
992
-            if (roleid != 0)
993
-            {
994
-                if (roleid != 17)
995
-                {
996
-                    if (deptid != 0)
997
-                        sql += " and F_RoleId=" + 1;
998
-                }
999
-            }
989
+            //int roleid = CurrentUser.UserData.F_RoleId;
990
+            //int deptid = CurrentUser.UserData.F_DeptId;
991
+            //if (roleid != 0)
992
+            //{
993
+            //    if (roleid != 17)
994
+            //    {
995
+            //        if (deptid != 0)
996
+                        //sql += " and F_RoleId=" + 1;
997
+            //    }
998
+            //}
1000
 
999
 
1001
-            if (userModel.F_SeartGroupID != 0)
1002
-            {
1003
-                sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
1004
-            }
1000
+            //if (userModel.F_SeartGroupID != 0)
1001
+            //{
1002
+            //    sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
1003
+            //}
1005
 
1004
 
1006
             List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
1005
             List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
1007
             if (userSeartList.Count > 0)
1006
             if (userSeartList.Count > 0)

+ 16 - 23
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

196
         /// <returns></returns>
196
         /// <returns></returns>
197
         public ActionResult GetOldList()
197
         public ActionResult GetOldList()
198
         {
198
         {
199
-            if (!Request.IsAuthenticated)
200
-                return NoToken("未知错误,请重新登录");
201
-            int userid = CurrentUser.UserData.F_UserId;
202
-            if (userid == 0)
203
-                return Error("用户信息获取失败,请重新登录");
204
-            Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userid);
205
-            if (ua == null)
206
-                return Error("信息获取失败,请重新登录");
199
+         
207
             string sql = "";
200
             string sql = "";
208
             string sqlcount = "";
201
             string sqlcount = "";
209
             DataTable dt = new DataTable();
202
             DataTable dt = new DataTable();
218
             string strpagesize = RequestString.GetQueryString("pagesize");
211
             string strpagesize = RequestString.GetQueryString("pagesize");
219
             int pagesize = 10;
212
             int pagesize = 10;
220
             #region 2018-05-30 lihai 坐席能看到同组的通话记录
213
             #region 2018-05-30 lihai 坐席能看到同组的通话记录
221
-            int seartGroupId = ua.F_SeartGroupID ?? 0;
222
-            if (seartGroupId != 0)
223
-            {
224
-                //groupcode判断是市场部或客服部的通话记录
225
-                var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
226
-                if (modelSeartGroup != null)
227
-                {
228
-                    sql += " and groupcode = '" + modelSeartGroup.F_ZXZCode + "' ";
229
-                }
230
-            }
231
-            else
232
-            {
233
-                //找不到对应坐席组
234
-                sql += " and UserCode='" + ua.F_UserCode + "' ";
235
-            }
214
+            //int seartGroupId = ua.F_SeartGroupID ?? 0;
215
+            //if (seartGroupId != 0)
216
+            //{
217
+            //    //groupcode判断是市场部或客服部的通话记录
218
+            //    var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
219
+            //    if (modelSeartGroup != null)
220
+            //    {
221
+            //        sql += " and groupcode = '" + modelSeartGroup.F_ZXZCode + "' ";
222
+            //    }
223
+            //}
224
+            //else
225
+            //{
226
+            //    //找不到对应坐席组
227
+            //    sql += " and UserCode='" + ua.F_UserCode + "' ";
228
+            //}
236
             #endregion
229
             #endregion
237
 
230
 
238
             if (strcalltype.Trim() != "" && strcalltype != "undefined")
231
             if (strcalltype.Trim() != "" && strcalltype != "undefined")