Browse Source

Merge branch 'release/yibin' of http://git.12345lm.cn/Fengwo/hotline into release/yibin

Dun.Jason 11 months ago
parent
commit
10b21cad95
1 changed files with 2 additions and 2 deletions
  1. 2 2
      src/Hotline.Api/Controllers/Bi/BiOrderController.cs

+ 2 - 2
src/Hotline.Api/Controllers/Bi/BiOrderController.cs

@@ -115,7 +115,7 @@ namespace Hotline.Api.Controllers.Bi
                     .WhereIF(dto.QueryType == 3, x => x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()) //业务待办超期
                     .WhereIF(dto.QueryType == 5, x =>
                         (x.Status >= EOrderStatus.Filed && x.ExpiredTime < x.FiledTime) || (x.Status < EOrderStatus.Filed && x.ExpiredTime < SqlFunc.GetDate()))
-                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 1 or 3, x => x.ActualHandleOrgCode == dto.OrgCode);
+                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 1 or 3, x => x.ActualHandleOrgCode.StartsWith(dto.OrgCode));
 
             if (dto.QueryType is 2 or 4 or 5)
             {
@@ -124,7 +124,7 @@ namespace Hotline.Api.Controllers.Bi
                     .Where((x, o) => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
                     .WhereIF(dto.QueryType == 2, (x, o) => o.IsHandled == true) //会签已办超期
                     .WhereIF(dto.QueryType == 4, (x, o) => o.IsHandled == false) //会签待办超期
-                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 2 or 4 or 5, (x, o) => o.Key == dto.OrgCode)
+                    .WhereIF(!string.IsNullOrEmpty(dto.OrgCode) && dto.QueryType is 2 or 4 or 5, (x, o) => o.Key.StartsWith(dto.OrgCode))
                     //.GroupBy((x,o)=>x.WorkflowId)
                     .Select((x, o) => new { Id = x.WorkflowId })
                     .MergeTable();