bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/ATheChangeLogController.cs

@@ -187,6 +187,72 @@ namespace CallCenterApi.Interface.Controllers
 
         }
 
+        /// <summary>
+        /// 驳回转移
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ActionResult BackChangeLog()
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+            //接收Id
+            int id = RequestString.GetInt("id", 0);
+
+            
+
+            Model.T_Sys_ATheChangeLog dModel = new Model.T_Sys_ATheChangeLog();
+            if (id == 0)
+            {
+
+                //dModel.F_CreateUserId = userId;
+                //dModel.F_CreateUserName = userModel.F_UserName;
+                //dModel.F_CreateDate = DateTime.Now;
+                //dModel.F_deptid = userModel.F_DeptId;
+                //dModel.F_deptname = userModel.depname;
+                //dModel.F_type = 0;
+                //dModel.F_CustomerId = pid;
+                //dModel.F_Memo = "系统自动记录转移 被拒绝："+ DateTime.Now+ "("+ userId + ")"+userModel.F_UserName;
+                //dModel.F_Bdeptid = F_Bdeptid;
+                //dModel.F_Bdeptname = F_Bdeptname;
+                //int n = areaBLL.Add(dModel);
+                //if (n > 0)
+                //    return Success("添加成功", n);
+                //else
+                    return Error("操作失败");
+
+            }
+            else
+            {
+                dModel = areaBLL.GetModel(id);
+                if (dModel != null)
+                {
+
+                 
+                    dModel.F_type = -1;
+
+                    dModel.F_Memo = "系统自动记录转移 被拒绝：" + DateTime.Now + "(" + userId + ")" + userModel.F_UserName;
+                    if (areaBLL.Update(dModel))
+                        return Success("修改成功");
+                    else
+                        return Error("修改失败");
+
+                }
+                else
+                {
+                    return Error("修改失败");
+                }
+            }
+        }
+
+
+
+
+
+
+
+
 
         /// <summary>
         /// 删除   之前看是否有接收记录

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

@@ -50,33 +50,55 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             }
             if (innerType==0) {
                 //转移
-                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+"))";
+                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 + "))";
+                }
+                
 
             }
             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(  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 + ") )";
+               
             }
             if (Zsz!="") {
                 sql += " and (  F_ZXZType='" + CurrentUser.UserData.F_SeartGroup+"')";
             }
+            //已接收非本部门的数据不可看到
+            sql += @" and (isnull((
+select F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 ),0)=0 or
+isnull((
+select F_Bdeptid from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id and F_type=1 ),0)<>
+"+ CurrentUser.UserData.F_DeptId +")";
+            
             #endregion
             int recordCount = 0;
 
             string cols = @"*,
 (select F_Name from T_Cus_Customer where F_Id=F_CusID) CusName,
-(select F_CreateUserName from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 and F_CustomerId=F_Id) as Auser,
-(select F_CreateDate from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 and F_CustomerId=F_Id) as ADate,
-(select F_deptname from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 and F_CustomerId=F_Id) as Adepname,
-(select F_Bdeptname from T_Sys_ATheChangeLog  where isnull(F_type,0)=0 and F_CustomerId=F_Id) as ABDepName,
-(select F_CreateUserName from T_Sys_BTheChangeLog  where  F_ATheChangeLog=(	select F_Id from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id ) ) as Buser,
-(select F_CreateDate from T_Sys_BTheChangeLog  where  F_ATheChangeLog=(	select F_Id from T_Sys_ATheChangeLog where F_CustomerId=T_Rec_RegRecords.F_Id ) ) as Bdate,
-(select F_Phone from T_Cus_Customer where F_Id=F_CusID) CusPhone,
-dbo.GetUserName(F_CreateBy) CreateByName ";
+ (select top 1 F_CreateUserName from T_Sys_ATheChangeLog  where    F_CustomerId=T_Rec_RegRecords.F_Id order by F_Id desc ) as Auser,
+ (select top 1 F_CreateDate from T_Sys_ATheChangeLog  where F_CustomerId=T_Rec_RegRecords.F_Id order by F_Id desc ) as ADate,
+ ( select top 1 F_deptname from T_Sys_ATheChangeLog  where F_CustomerId=T_Rec_RegRecords.F_Id order by F_Id desc ) as Adepname,
+ (select top 1 F_Bdeptname from T_Sys_ATheChangeLog  where F_CustomerId=T_Rec_RegRecords.F_Id order by F_Id desc ) as ABDepName,
+ (select top 1 F_type from T_Sys_ATheChangeLog  where F_CustomerId=T_Rec_RegRecords.F_Id order by F_Id desc ) as AType,
+ (select top 1 F_Id  from T_Sys_ATheChangeLog  where    F_CustomerId=T_Rec_RegRecords.F_Id order by F_Id desc ) as Aid,
+
+ (select F_Phone from T_Cus_Customer where F_Id=F_CusID) CusPhone
+   ";
 
             dt = BLL.PagerBLL.GetListPager(
-                "T_Rec_RegRecords",
+                "T_Rec_RegRecords ",
                 "F_ID",
                 cols,
                 sql,