修改

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HistoryController.cs

@@ -10,6 +10,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
+    [Authority]
     public class HistoryController : BaseController
     {
         /// <summary>
@@ -18,13 +19,9 @@ namespace CallCenterApi.Interface.Controllers
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        [Authority]
+        //[Authority]
         public ActionResult Add()
         {
-            
-
-            
-            
             string name = RequestString.GetFormString("name");
             string remark = RequestString.GetFormString("count");
             Model.T_Sys_History  dModel = new Model.T_Sys_History();
@@ -40,9 +37,6 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult Delete(int type=0,int id=0)
         {
-            
-            
-            
              if (type ==0)
              {
                 if (id >0)
@@ -74,7 +68,7 @@ namespace CallCenterApi.Interface.Controllers
         /// 获取列表
         /// </summary>
         /// <returns></returns>
-        [Authority]
+        //[Authority]
         public ActionResult GetList()
         {
             

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

@@ -7800,7 +7800,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 0:
                         #region 基本信息
                         string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName1,"
-                                    + "dbo.GetAreaName(F_SourceArea) as AreaName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDictionaryName(F_Key) as KeyName,dbo.GetDeptName(F_MainDeptId) deptname ," + "F_DeptIdIsSms = (select F_IsSms  from T_Sys_Department where F_DeptId =a.F_MainDeptId)"
+                                    + "dbo.GetAreaName(F_SourceArea) as AreaName,dbo.GetDictionaryName(F_InfoSource) as SourceName,dbo.GetDictionaryName(F_Key) as KeyName,dbo.GetDeptName(F_MainDeptId) deptname ," + "F_DeptIdIsSms = (select F_IsSms  from T_Sys_Department WITH(NOLOCK) where F_DeptId =a.F_MainDeptId)"
                                       + " from T_Bus_WorkOrder a WITH(NOLOCK) where F_WorkOrderId ='" + strworkorderid + "'";
                         var dt = DbHelperSQL.Query(sql).Tables[0];
                         if (dt.Rows.Count > 0)
@@ -8047,7 +8047,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     #endregion
                     case 9:
                         #region 办理过程
-                        string gcsql = "select o.*,u.F_UserName from T_Bus_Operation o left join T_Sys_UserAccount u on o.F_CreateUser=u.F_UserCode  where o.F_IsDelete=0 and o.F_WorkOrderId ='" + strworkorderid + "' order by o.F_CreateTime ";
+                        string gcsql = "select o.*,u.F_UserName from T_Bus_Operation o WITH(NOLOCK) left join T_Sys_UserAccount u WITH(NOLOCK) on o.F_CreateUser=u.F_UserCode  where o.F_IsDelete=0 and o.F_WorkOrderId ='" + strworkorderid + "' order by o.F_CreateTime ";
                         var gcdt = DbHelperSQL.Query(gcsql).Tables[0];
                         gcdt.Columns.Add("File", typeof(object));
                         gcdt.Columns.Add("FilePath", typeof(string));
@@ -12322,7 +12322,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (modelT_Bus_AssignedInfo.F_IsNext == 1 || modelT_Bus_AssignedInfo.F_IsNext == 2)
             {
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
-                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_AssignedInfo_Next.F_MainDeptId + ") and F_DeleteFlag=0");
+                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_AssignedInfo_Next.F_MainDeptId??0 + ") and F_DeleteFlag=0");
                 if (user != null)
                 {
                     foreach (var iv in user)
@@ -12341,7 +12341,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else
             {
-                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_WorkOrder.F_MainDeptId + ") and F_DeleteFlag=0");
+                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_WorkOrder.F_MainDeptId ?? 0 + ") and F_DeleteFlag=0");
                 if (user != null)
                 {
                     foreach (var iv in user)