Procházet zdrojové kódy

工单也放开权限..........

MicroWin10-1604\Administrator %!s(int64=7) %!d(string=před) roky
rodič
revize
de06241b6d

+ 17 - 17
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -368,7 +368,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
368 368
                         {
369 369
                             sql += " and datediff(day,CreateTime,'" + strendtime + "')>=0   ";
370 370
                         }
371
-                        if (isldtp == 1)
371
+                        //if (isldtp == 1)
372 372
                         {
373 373
                             var dtdep = DbHelperSQL.Query("select F_ZXZID,F_ZXZName from [dbo].[T_Sys_SeatGroup],T_Sys_UserAccount where T_Sys_UserAccount.F_SeartGroupID =[dbo].[T_Sys_SeatGroup].F_ZXZID and F_UserCode ='" + ua.F_UserCode + "' ").Tables[0].Rows[0];
374 374
                             var depid = dtdep["F_ZXZID"];
@@ -407,20 +407,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
407 407
                                 sql += " and (LastDealUser in (" + scucodes + ") or CreateUser in (" + scucodes + ")) ";
408 408
                             }
409 409
                         }
410
-                        else
411
-                        {
412
-                            if (ua.F_RoleId != 17)//管理员
413
-                            {
414
-                                if (gdstate == 0)//未处理
415
-                                {
416
-                                    sql += " and CreateUser='" + ua.F_UserCode + "' ";
417
-                                }
418
-                                else if (gdstate == 1)
419
-                                    sql += " and LastDealUser = '" + ua.F_UserCode + "'";
420
-                                else //综合查询时
421
-                                    sql += " and (LastDealUser = '" + ua.F_UserCode + "' or CreateUser='" + ua.F_UserCode + "') ";
422
-                            }
423
-                        }
410
+                        //else
411
+                        //{
412
+                        //    if (ua.F_RoleId != 17)//管理员
413
+                        //    {
414
+                        //        if (gdstate == 0)//未处理
415
+                        //        {
416
+                        //            sql += " and CreateUser='" + ua.F_UserCode + "' ";
417
+                        //        }
418
+                        //        else if (gdstate == 1)
419
+                        //            sql += " and LastDealUser = '" + ua.F_UserCode + "'";
420
+                        //        else //综合查询时
421
+                        //            sql += " and (LastDealUser = '" + ua.F_UserCode + "' or CreateUser='" + ua.F_UserCode + "') ";
422
+                        //    }
423
+                        //}
424 424
                         if (strpageindex.Trim() != "")
425 425
                         {
426 426
                             pageindex = Convert.ToInt32(strpageindex);
@@ -434,7 +434,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
434 434
                         dt = BLL.PagerBLL.GetListPager(
435 435
                             "T_Wo_WorkOrder",
436 436
                             "T_Wo_WorkOrder.ID",
437
-                            "*,dbo.GetDictionaryName(Type) as GDLYName,dbo.GetGDLXName(TypeClass) as TypeClassName,dbo.GetUserName(CreateUser) as CreateUserName,dbo.GetUserName(LastDealUser) as LastDealUserName, dbo.GetDeptName(ResponDept) as ResponDeptName,dbo.GetUserName(ResponUser) as ResponUserName,convert(decimal(18,2),DATEDIFF(minute, CreateTime, ISNULL(LastDealTime, GETDATE()))/60.00) as totalhour",
437
+                            "*,dbo.GetDictionaryName(Type) as GDLYName,dbo.GetGDLXName(TypeClass) as TypeClassName,dbo.GetUserName(CreateUser) as CreateUserNameRel,dbo.GetUserName(LastDealUser) as LastDealUserNameRel, dbo.GetDeptName(ResponDept) as ResponDeptName,dbo.GetUserName(ResponUser) as ResponUserName,convert(decimal(18,2),DATEDIFF(minute, CreateTime, ISNULL(LastDealTime, GETDATE()))/60.00) as totalhour",
438 438
                             sql,
439 439
                             "ORDER BY T_Wo_WorkOrder.ID desc",
440 440
                             pagesize,
@@ -1221,7 +1221,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
1221 1221
                                 idd += str + ",";
1222 1222
                             }
1223 1223
 
1224
-                            string sql = "update T_Wo_WorkOrder set IsDel=1,DelUser='" + ua.F_UserCode + "',DelTime=getdate() where ID in(" + idd.TrimEnd(',') + ")";
1224
+                            string sql = "update T_Wo_WorkOrder set IsDel=1,DelUser='" + ua.F_UserCode + "',DelTime=getdate() where ID in (" + idd.TrimEnd(',') + ")";
1225 1225
                             if (!string.IsNullOrEmpty(idd.Trim()))
1226 1226
                             {
1227 1227
                                 if (DbHelperSQL.ExecuteSql(sql) > 0)