zhoufan 4 years ago
parent
commit
ad704d0234

+ 3 - 9
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HistoryController.cs

10
 
10
 
11
 namespace CallCenterApi.Interface.Controllers
11
 namespace CallCenterApi.Interface.Controllers
12
 {
12
 {
13
+    [Authority]
13
     public class HistoryController : BaseController
14
     public class HistoryController : BaseController
14
     {
15
     {
15
         /// <summary>
16
         /// <summary>
18
         /// <param name="input"></param>
19
         /// <param name="input"></param>
19
         /// <returns></returns>
20
         /// <returns></returns>
20
         [HttpPost]
21
         [HttpPost]
21
-        [Authority]
22
+        //[Authority]
22
         public ActionResult Add()
23
         public ActionResult Add()
23
         {
24
         {
24
-            
25
-
26
-            
27
-            
28
             string name = RequestString.GetFormString("name");
25
             string name = RequestString.GetFormString("name");
29
             string remark = RequestString.GetFormString("count");
26
             string remark = RequestString.GetFormString("count");
30
             Model.T_Sys_History  dModel = new Model.T_Sys_History();
27
             Model.T_Sys_History  dModel = new Model.T_Sys_History();
40
         }
37
         }
41
         public ActionResult Delete(int type=0,int id=0)
38
         public ActionResult Delete(int type=0,int id=0)
42
         {
39
         {
43
-            
44
-            
45
-            
46
              if (type ==0)
40
              if (type ==0)
47
              {
41
              {
48
                 if (id >0)
42
                 if (id >0)
74
         /// 获取列表
68
         /// 获取列表
75
         /// </summary>
69
         /// </summary>
76
         /// <returns></returns>
70
         /// <returns></returns>
77
-        [Authority]
71
+        //[Authority]
78
         public ActionResult GetList()
72
         public ActionResult GetList()
79
         {
73
         {
80
             
74
             

+ 4 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

7800
                     case 0:
7800
                     case 0:
7801
                         #region 基本信息
7801
                         #region 基本信息
7802
                         string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName1,"
7802
                         string sql = "select *,dbo.GetUserName(F_CreateUser) as UserName,dbo.GetDictionaryName(F_InfoType) as TypeName1,"
7803
-                                    + "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)"
7803
+                                    + "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)"
7804
                                       + " from T_Bus_WorkOrder a WITH(NOLOCK) where F_WorkOrderId ='" + strworkorderid + "'";
7804
                                       + " from T_Bus_WorkOrder a WITH(NOLOCK) where F_WorkOrderId ='" + strworkorderid + "'";
7805
                         var dt = DbHelperSQL.Query(sql).Tables[0];
7805
                         var dt = DbHelperSQL.Query(sql).Tables[0];
7806
                         if (dt.Rows.Count > 0)
7806
                         if (dt.Rows.Count > 0)
8047
                     #endregion
8047
                     #endregion
8048
                     case 9:
8048
                     case 9:
8049
                         #region 办理过程
8049
                         #region 办理过程
8050
-                        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 ";
8050
+                        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 ";
8051
                         var gcdt = DbHelperSQL.Query(gcsql).Tables[0];
8051
                         var gcdt = DbHelperSQL.Query(gcsql).Tables[0];
8052
                         gcdt.Columns.Add("File", typeof(object));
8052
                         gcdt.Columns.Add("File", typeof(object));
8053
                         gcdt.Columns.Add("FilePath", typeof(string));
8053
                         gcdt.Columns.Add("FilePath", typeof(string));
12322
             if (modelT_Bus_AssignedInfo.F_IsNext == 1 || modelT_Bus_AssignedInfo.F_IsNext == 2)
12322
             if (modelT_Bus_AssignedInfo.F_IsNext == 1 || modelT_Bus_AssignedInfo.F_IsNext == 2)
12323
             {
12323
             {
12324
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
12324
                 Model.T_Bus_AssignedInfo_Next modelT_Bus_AssignedInfo_Next = new BLL.T_Bus_AssignedInfo_Next().GetNewModelByWorkOrderID(workorderid);
12325
-                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_AssignedInfo_Next.F_MainDeptId + ") and F_DeleteFlag=0");
12325
+                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_AssignedInfo_Next.F_MainDeptId??0 + ") and F_DeleteFlag=0");
12326
                 if (user != null)
12326
                 if (user != null)
12327
                 {
12327
                 {
12328
                     foreach (var iv in user)
12328
                     foreach (var iv in user)
12341
             }
12341
             }
12342
             else
12342
             else
12343
             {
12343
             {
12344
-                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_WorkOrder.F_MainDeptId + ") and F_DeleteFlag=0");
12344
+                var user = new BLL.T_Sys_UserAccount().GetModelList(" F_DeptId in (" + modelT_Bus_WorkOrder.F_MainDeptId ?? 0 + ") and F_DeleteFlag=0");
12345
                 if (user != null)
12345
                 if (user != null)
12346
                 {
12346
                 {
12347
                     foreach (var iv in user)
12347
                     foreach (var iv in user)