1

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -2441,7 +2441,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                        
                         ////话务员，已办待回访菜单中可以看到所有工单并能操作
-                        if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY")
+                        if (User.F_RoleCode != "ZJZY" && User.F_RoleCode != "ZXHWY" )
                             sql += " and F_CreateUser='" + User.F_UserCode + "'";
                         //话务员，已办待回访菜单中可以看到所有工单并能操作
                     }
@@ -3216,7 +3216,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             sql += "  and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
 
                             if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLDGLY" && User.F_RoleCode != "ZXLDGLYGLY" && User.F_RoleCode != "DDZG"
-                                && User.F_RoleCode != "ZXLD " && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ"
+                               && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ"
                                )
                             {
                                 sql += " and F_CreateUser='" + User.F_UserCode + "')";
@@ -3235,7 +3235,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     + " F_State = 1 and F_IsDelete = 0 and T_Bus_AssignedInfo.F_WorkOrderId = T_Bus_WorkOrder.F_WorkOrderId) is null)";
                                 sql += " and F_WorkState != '9' ";
                             }
-                            if (User.F_RoleCode == "ZXHWY")
+                            if (User.F_RoleCode == "ZXHWY"|| User.F_RoleCode == "ZXLD")
                             {
                                 sql += "  and F_CreateUser='" + User.F_UserCode + "' ";
                             }
@@ -3270,7 +3270,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                     if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLDGLY" && User.F_RoleCode != "ZXLDGLYGLY" && User.F_RoleCode != "DDZG"
-                        && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
+                         && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
                     {
                         sql += " and F_CreateUser='" + User.F_UserCode + "'";
                     }
@@ -3437,7 +3437,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //  sql += " and F_WorkOrderID in(select F_WorkOrderID from T_Bus_Feedback b WITH(NOLOCK) where F_State = 1 and F_IsDelete = 0 and F_Type = 3 and F_IsAudit = 1  ) ";
                     // sql += "and F_WorkOrderID in(  select  b.F_WorkOrderID from T_Bus_Feedback b  WITH(NOLOCK)  inner join T_Bus_Feedback a on a.F_Id = b.F_Id and a .F_Id = (select max(t1.F_Id) from T_Bus_Feedback t1 where t1.F_WorkOrderId = b.F_WorkOrderId)  where b.F_State = 1 and b.F_IsDelete = 0 and b.F_Type = 3 and b.F_IsAudit = 1  ) ";
 
-                    if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" && User.F_RoleCode != "ZXLD")
+                    if (User.F_RoleCode != "GLY" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ" )
                     {
                         sql += " and F_CreateUser='" + User.F_UserCode + "'";
                     }
@@ -3446,7 +3446,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 case "11"://
 
                     sql += " and F_WorkState =14";
-                    if (User.F_RoleCode != "GLY" && User.F_RoleCode != "ZXLD" && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
+                    if (User.F_RoleCode != "GLY"  && User.F_RoleCode != "SPZ" && User.F_RoleCode != "SPZJZ")
                     {
                         sql += " and F_CreateUser='" + User.F_UserCode + "'";
                     }
@@ -3876,8 +3876,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (Int32.Parse(strtab) != 11 && Int32.Parse(strtab) != 9)
                             btns.Add(ButtonGroup.turnsee());
                     }
-
-
+                    //if (User.F_RoleCode.ToUpper() == "ZXHWY")
+                    //{
+                    //    if (Int32.Parse(strtab)== 0)
+                    //    {
+                    //        btns.Add(ButtonGroup.turnsee());
+                    //        if (dr["F_WorkState"].ToString()=="1")
+                    //        {
+                    //            btns.Add(ButtonGroup.edit());
+                    //            btns.Add(ButtonGroup.back());
+                    //            btns.Add(ButtonGroup.Report());
+                    //            btns.Add(ButtonGroup.trans());
+                    //        }
+                    //        else if (dr["F_WorkState"].ToString() == "11")
+                    //        {
+                    //            btns.Add(ButtonGroup.reload()); btns.Add(ButtonGroup.reject());
+                    //        }
+                    //    }
+                    //}
                     if (strtab == "0" && issh == 2)
                     {
                         dr["DeptName"] = DbHelperSQL.GetSingle("  select [dbo].[GetDeptNames]( (select top 1  F_MainDeptId  from T_Bus_ToExamine where F_WorkOrderId ='" + dr["F_WorkOrderId"].ToString() + "' and F_IsDelete = 0 and F_MainDeptId is not null and F_State = 0 and F_IsDelete = 0 and  F_AssignedId = 0and F_MainDeptId != '' order by F_ID desc))");
@@ -5416,7 +5432,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
 
-            if (User.F_RoleCode == "ZXHWY")
+            if (User.F_RoleCode == "ZXHWY"||User.F_RoleCode == "ZXLD")
             {
                 sql += " and F_CreateUser = '" + User.F_UserCode + "' ";
             }
@@ -12128,7 +12144,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #endregion
                     if (state > 0)
                     {
-                        if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
+                        if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
                         {
 
                             int assignid = RequestString.GetInt("assignid", 0);
@@ -13271,7 +13287,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         //[Authority]
         public ActionResult AssignWorkOrderNew(List<maindeptcontent> content)
         {
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "DBZY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "DBZY" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
                 int state = RequestString.GetInt("state", 0);
@@ -21617,7 +21633,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         //[Authority]
         public ActionResult ReloadWorkOrder()
         {
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
             //if (User.F_RoleCode == "ZJZY" || User.F_RoleCode == "GLY")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
@@ -22333,7 +22349,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             // var User = new BLL.T_Sys_UserAccount ().GetModel("8000");
 
 
-            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
+            if (User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ")
             //if (User.F_RoleCode == "ZJZY" || User.F_RoleCode == "GLY")
             {
                 string workorderid = RequestString.GetFormString("workorderid");

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -784,7 +784,7 @@ namespace CallCenterApi.Interface.Models.Common
                     break;
                 case "11":
                     //调度专员 中心领导管理员 管理员
-                    if (code == "ZXLD" || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
+                    if (code == "ZXLD"  || code == "ZXLDGLYGLY" || code == "GLY" || code == "DDZG" || code == "SPZ" || code == "SPZJZ")
                     {
                         buttons.Add(reload()); buttons.Add(reject());
                     }