坐席能看到同组的通话记录(修改三个地方)

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

@@ -244,21 +244,45 @@ namespace CallCenterApi.Interface.Controllers.tel
                         //20180507 每个人都能看到该来电的所有历史记录 machenyang
                         //if (ua.F_RoleId != 17)
                         //    sql += " and UserId = '" + userId + "'";
-                        //20180514 坐席能看到同组的 
-                        var usergroup = ua.F_SeartGroup;
-                        var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
-                        var str = "";
-                        if (usercodes != null)
+                        ////20180514 坐席能看到同组的 
+                        //var usergroup = ua.F_SeartGroup;
+                        //var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
+                        //var str = "";
+                        //if (usercodes != null)
+                        //{
+                        //    foreach (var item in usercodes)
+                        //    {
+                        //        str += item.ToString() + ',';
+                        //    }
+                        //    str = str.TrimEnd(',');
+                        //    sql += " and UserCode in ("+str+") ";
+                        //}
+                        //else
+                        //    sql += " and UserCode='"+ua.F_UserCode+"' ";
+                        #region 2018-05-30 lihai 坐席能看到同组的通话记录
+                        int seartGroupId = ua.F_SeartGroupID ?? 0;
+                        if (seartGroupId != 0)
                         {
-                            foreach (var item in usercodes)
+                            //groupcode判断是市场部或客服部的通话记录
+                            var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
+                            if (modelSeartGroup != null)
                             {
-                                str += item.ToString() + ',';
+                                if (modelSeartGroup.F_ZXZCode == "SCZ")
+                                {
+                                    sql += " and groupcode = 'SCZ' ";
+                                }
+                                else
+                                {
+                                    sql += " and groupcode = 'KFZ' ";
+                                }
                             }
-                            str = str.TrimEnd(',');
-                            sql += " and UserCode in ("+str+") ";
                         }
                         else
-                            sql += " and UserCode='"+ua.F_UserCode+"' ";
+                        {
+                            //找不到对应坐席组
+                            sql += " and UserCode='" + ua.F_UserCode + "' ";
+                        }
+                        #endregion
 
                         if (strcalltype.Trim() != "" && strcalltype != "undefined")
                         {

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

@@ -67,53 +67,48 @@ namespace CallCenterApi.Interface.Controllers.tel
             //        }
             //    }
             //}
-            //20180515 坐席能看到同组的 
-            var usergroup = new BLL.T_Sys_UserAccount().GetModel(currcode) == null ? "" : new BLL.T_Sys_UserAccount().GetModel(currcode).F_SeartGroup;
-            var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
-            var str = "";
-            if (usercodes != null)
-            {
-                foreach (var item in usercodes)
-                {
-                    str += item.ToString() + ',';
-                }
-                str = str.TrimEnd(',');
-                sql += " and UserCode in (" + str + ") ";
-            }
-            else
-                sql += " and UserCode='" + usercode + "' ";
-            //#region 2018-05-23 lihai 坐席能看到同组的通话记录
-            //int seartGroupId = 0;
-            //var modelUser = new BLL.T_Sys_UserAccount().GetModel(currcode);
-            //if (modelUser != null)
-            //    seartGroupId = modelUser.F_SeartGroupID ?? 0;
-            //if (seartGroupId != 0)
+            ////20180515 坐席能看到同组的 
+            //var usergroup = new BLL.T_Sys_UserAccount().GetModel(currcode) == null ? "" : new BLL.T_Sys_UserAccount().GetModel(currcode).F_SeartGroup;
+            //var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
+            //var str = "";
+            //if (usercodes != null)
             //{
-            //    //安图特殊，0客服部，1市场部
-            //    //BusinessType设置是市场部或客服部的通话记录
-            //    var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
-            //    if (modelSeartGroup != null)
+            //    foreach (var item in usercodes)
             //    {
-            //        if (modelSeartGroup.F_ZXZCode == "SCZ")
-            //        {
-            //            sql += " and ISNULL(BusinessType,0) = 1 ";
-            //        }
-            //        else
-            //        {
-            //            sql += " and ISNULL(BusinessType,0) = 0 ";
-            //        }
-            //    }
-            //    else
-            //    {
-            //        //找不到对应坐席组
-            //        sql += " and UserCode='" + usercode + "' ";
+            //        str += item.ToString() + ',';
             //    }
+            //    str = str.TrimEnd(',');
+            //    sql += " and UserCode in (" + str + ") ";
             //}
             //else
-            //{
             //    sql += " and UserCode='" + usercode + "' ";
-            //}
-            //#endregion
+            #region 2018-05-30 lihai 坐席能看到同组的通话记录
+            int seartGroupId = 0;
+            var modelUser = new BLL.T_Sys_UserAccount().GetModel(currcode);
+            if (modelUser != null)
+                seartGroupId = modelUser.F_SeartGroupID ?? 0;
+            if (seartGroupId != 0)
+            {
+                //groupcode判断是市场部或客服部的通话记录
+                var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
+                if (modelSeartGroup != null)
+                {
+                    if (modelSeartGroup.F_ZXZCode == "SCZ")
+                    {
+                        sql += " and groupcode = 'SCZ' ";
+                    }
+                    else
+                    {
+                        sql += " and groupcode = 'KFZ' ";
+                    }
+                }
+            }
+            else
+            {
+                //找不到对应坐席组
+                sql += " and UserCode='" + usercode + "' ";
+            }
+            #endregion
 
             if (usercode != null && usercode.Trim() != "")
             {
@@ -279,21 +274,48 @@ namespace CallCenterApi.Interface.Controllers.tel
                 //{
                 //    sql += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
                 //}
-                //20180515 坐席能看到同组的 
-                var usergroup = new BLL.T_Sys_UserAccount().GetModel(currcode) == null ? "" : new BLL.T_Sys_UserAccount().GetModel(currcode).F_SeartGroup;
-                var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
-                var str = "";
-                if (usercodes != null)
+                ////20180515 坐席能看到同组的 
+                //var usergroup = new BLL.T_Sys_UserAccount().GetModel(currcode) == null ? "" : new BLL.T_Sys_UserAccount().GetModel(currcode).F_SeartGroup;
+                //var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
+                //var str = "";
+                //if (usercodes != null)
+                //{
+                //    foreach (var item in usercodes)
+                //    {
+                //        str += item.ToString() + ',';
+                //    }
+                //    str = str.TrimEnd(',');
+                //    sql += " and UserCode in (" + str + ") ";
+                //}
+                //else
+                //    sql += " and UserCode='" + usercode + "' ";
+                #region 2018-05-30 lihai 坐席能看到同组的通话记录
+                int seartGroupId = 0;
+                var modelUser = new BLL.T_Sys_UserAccount().GetModel(currcode);
+                if (modelUser != null)
+                    seartGroupId = modelUser.F_SeartGroupID ?? 0;
+                if (seartGroupId != 0)
                 {
-                    foreach (var item in usercodes)
+                    //groupcode判断是市场部或客服部的通话记录
+                    var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
+                    if (modelSeartGroup != null)
                     {
-                        str += item.ToString() + ',';
+                        if (modelSeartGroup.F_ZXZCode == "SCZ")
+                        {
+                            sql += " and groupcode = 'SCZ' ";
+                        }
+                        else
+                        {
+                            sql += " and groupcode = 'KFZ' ";
+                        }
                     }
-                    str = str.TrimEnd(',');
-                    sql += " and UserCode in (" + str + ") ";
                 }
                 else
+                {
+                    //找不到对应坐席组
                     sql += " and UserCode='" + usercode + "' ";
+                }
+                #endregion
 
                 if (usercode != null && usercode.Trim() != "")
                 {