Merge branch 'master' of http://192.168.1.222:3000/duhongyu/HeBi12345_API

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

@@ -13063,7 +13063,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public ActionResult AuditWorkorders()
         {
            
-            if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
+            if ( User.F_RoleCode == "SPZ" || User.F_RoleCode == "SPZJZ" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
             {
                 string workorderid = RequestString.GetFormString("workorderid");
                 string cbreason = RequestString.GetFormString("cbreason");

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/hb_affairsController.cs

@@ -1223,7 +1223,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Content(obj.ToJson());
             }
 
+            var workoder = DbHelperSQL.GetSingle(" select top 1 F_OldWorkOrder from T_Bus_Mapping  where F_NewWorkOrder='" + result["CASE_SERIAL"].ToString() + "'and F_Type=1  order by F_CreateTime desc ");
             string workoderid = result["CASE_SERIAL"].ToString();
+            if (workoder != null)
+            {
+                workoderid = workoder.ToString()
+;
+            }
 
             Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workoderid);
             Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workoderid);