src/Hotline.Api/Controllers/OrderController.cs

@@ -1617,23 +1617,40 @@ public class OrderController : BaseController
         var systemAdministrator = _systemSettingCacheManager.GetSetting(SettingConstants.SystemAdministrator)?.SettingValue[0];
 
         if (!string.IsNullOrEmpty(systemAdministrator) && (_sessionContext.Roles.Contains(systemAdministrator) || _sessionContext.Roles.Contains(RoleSeedData.AdminRole)))
-            canView = false;
-
-        var isHandled = dto.IsApply.HasValue && dto.IsApply.Value;
-        var (total, items) = await _orderDelayRepository
-            .Queryable(canView: canView, hasHandled: isHandled)
-            .Includes(d => d.Order)
-            .Includes(d => d.Workflow)
-            .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
-                d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
-            //.WhereIF(dto.IsApply == true, d => d.DelayState != EDelayState.Examining)
-            .WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
-            //.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
-            //.Where(x=>x.DelayState == EDelayState.Examining)
-            .OrderByDescending(d => d.ApplyDelayTime)
-            .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-
-        return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
+        {
+            var (total, items) = await _orderDelayRepository
+           .Queryable(false, false, false)
+           .Includes(d => d.Order)
+           .Includes(d => d.Workflow)
+           .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
+               d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
+           //.WhereIF(dto.IsApply == true, d => d.DelayState != EDelayState.Examining)
+           .WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
+           //.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
+           //.Where(x=>x.DelayState == EDelayState.Examining)
+           .OrderByDescending(d => d.ApplyDelayTime)
+           .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+
+            return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
+        }
+        else
+        {
+            var isHandled = dto.IsApply.HasValue && dto.IsApply.Value;
+            var (total, items) = await _orderDelayRepository
+                .Queryable(hasHandled: isHandled)
+                .Includes(d => d.Order)
+                .Includes(d => d.Workflow)
+                .WhereIF(!string.IsNullOrEmpty(dto.Keyword),
+                    d => d.Order.Title.Contains(dto.Keyword!) || d.No.Contains(dto.Keyword!))
+                //.WhereIF(dto.IsApply == true, d => d.DelayState != EDelayState.Examining)
+                .WhereIF(dto.IsApply == false, d => d.DelayState == EDelayState.Examining)
+                //.WhereIF(dto.DelayState != null, x => x.DelayState == dto.DelayState)
+                //.Where(x=>x.DelayState == EDelayState.Examining)
+                .OrderByDescending(d => d.ApplyDelayTime)
+                .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+
+            return new PagedDto<OrderDelayDto>(total, _mapper.Map<IReadOnlyList<OrderDelayDto>>(items));
+        }
     }
 
     /// <summary>

src/Hotline.Api/config/appsettings.Development.json

@@ -29,7 +29,7 @@
     }
   },
   "ConnectionStrings": {
-    "Hotline": "PORT=5432;DATABASE=hotline;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
+    "Hotline": "PORT=5432;DATABASE=hotline_dev;HOST=110.188.24.182;PASSWORD=fengwo11!!;USER ID=dev;"
     //"Redis": "110.188.24.182:50179",
     //"MongoDB": "mongodb://192.168.100.121:27017",
     //"Wex": "server=222.212.82.225;Port=4509;Database=fs_kft;Uid=root;Pwd=Wex@12345;"
@@ -38,7 +38,7 @@
     "Host": "110.188.24.182",
     "Port": 50179,
     "Password": "fengwo123!$!$",
-    "Database": 3 //release:3, dev:5
+    "Database": 5 //release:3, dev:5
   },
   "Swagger": true,
   "Cors": {