Parcourir la source

Merge branch 'master' of http://110.188.24.182:10023/Fengwo/hotline

xf il y a 1 an
Parent
commit
8b88818ac2
1 fichiers modifiés avec 2 ajouts et 1 suppressions
  1. 2 1
      src/Hotline.Api/Controllers/Bi/BiOrderController.cs

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

@@ -851,7 +851,8 @@ namespace Hotline.Api.Controllers.Bi
             var (total,items) = await _orderVisitDetailRepository.Queryable()
                 .Includes(x => x.OrderVisit, o => o.Order, d => d.CallRecord)
                 .Where(x => x.OrderVisit.VisitTime >= dto.StartDate && x.OrderVisit.VisitTime <= dto.EndDate && x.VisitTarget == EVisitTarget.Org && x.OrderVisit.VisitState == EVisitState.Visited)
-                .Where(x => x.VisitOrgCode.StartsWith(dto.OrgCode))
+                .WhereIF(dto.OrgCode=="001",x => x.VisitOrgCode==dto.OrgCode)
+                .WhereIF(dto.OrgCode!="001",x => x.VisitOrgCode.StartsWith(dto.OrgCode))
                 .WhereIF(dto.TypeId == 1, x => SqlFunc.JsonField(x.OrgProcessingResults, "Key") == dto.DateValue)
                 .WhereIF(dto.TypeId == 2, x => SqlFunc.JsonField(x.OrgHandledAttitude, "Key") == dto.DateValue)
                 .WhereIF(!string.IsNullOrEmpty(dto.LineNum), x => x.OrderVisit.Order.CallRecord.Gateway == dto.LineNum)