From 027b06b9d977a8cd896c1fe52efe5e9a339f690b Mon Sep 17 00:00:00 2001
From: hardstylewyl <827778732@qq.com>
Date: Mon, 31 Mar 2025 10:32:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=BF=94=E5=9B=9E=E6=80=BB=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Warning/CompleteWarningService.cs       |  8 ++++++--
 .../Services/Warning/ReturnWarningService.cs         |  8 +++++++-
 .../Services/Warning/TransportWarningService.cs      |  7 +++++--
 .../Repositories/WarningDetailsEsRepository.cs       | 12 +++++++++---
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs
index 2f535795..07a6140b 100644
--- a/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/CompleteWarningService.cs
@@ -128,9 +128,13 @@ public class CompleteWarningService : ApplicationService
     {
         var vo = ObjectMapper.Map<GetPageCompleteWarningDetailsInput, GetPageCompleteWarningDetailsInputVO>(input);
         var result = await _warningDetailsEsRepository.GetPageCompleteWarningDetailsAsync(vo);
-
         if (result.List.Count == 0)
-            return new UnifyPageResultDto<CompleteWarningDetailsDto>(new List<CompleteWarningDetailsDto>(), input.PageIndex, input.PageSize, 0);
+        {
+            return new UnifyPageResultDto<CompleteWarningDetailsDto>(new List<CompleteWarningDetailsDto>(),
+                result.Pagination.PageIndex,
+                result.Pagination.PageSize,
+                result.Pagination.Total);
+        }
 
         // todo:缓存优化
         var trackStatusIds = result.List
diff --git a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
index 7eb2eb8a..8412465b 100644
--- a/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/ReturnWarningService.cs
@@ -108,7 +108,13 @@ public class ReturnWarningService : ApplicationService
     {
         var vo = ObjectMapper.Map<GetPageReturnWarningDetailsInput, GetPageReturnWarningDetailsInputVO>(input);
         var result = await _warningDetailsEsRepository.GetPageReturnWarningDetailsAsync(vo);
-
+        if (result.List.Count == 0)
+        {
+            return new UnifyPageResultDto<ReturnWarningDetailsDto>(new List<ReturnWarningDetailsDto>(),
+                result.Pagination.PageIndex,
+                result.Pagination.PageSize,
+                result.Pagination.Total);
+        }
         // todo:缓存优化
         // 订单类型
         var orderTypeDict = await _orderRepository.GetTrackOrderTypeDictAsync();
diff --git a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
index 2787d3c4..a099b53d 100644
--- a/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
+++ b/src/SJZY.Track.Application/Services/Warning/TransportWarningService.cs
@@ -178,7 +178,10 @@ public class TransportWarningService : ApplicationService
         var result = await _warningDetailsEsRepository.GetPageTransportWarningDetailsAsync(vo);
         if (result.List.Count == 0)
         {
-            return new UnifyPageResultDto<TransportWarningDetailsDto>(new List<TransportWarningDetailsDto>(), input.PageIndex, input.PageSize, 0);
+            return new UnifyPageResultDto<TransportWarningDetailsDto>(new List<TransportWarningDetailsDto>(),
+                result.Pagination.PageIndex,
+                result.Pagination.PageSize,
+                result.Pagination.Total);
         }
 
         // 查最新轨迹(创建时间)
@@ -269,7 +272,7 @@ public class TransportWarningService : ApplicationService
             sorted,
             result.Pagination.PageIndex,
             result.Pagination.PageSize,
-            sorted.Count);
+            result.Pagination.Total);
 
         // 通知用户提取用户名称
         string ToUserNames(string notifyUsers)
diff --git a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs b/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs
index b7271d75..093cc667 100644
--- a/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/WarningDetailsEsRepository.cs
@@ -45,7 +45,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             .Index(GlobalConst.TransportWarningDetailsIndex)
             .Query(q => q.Bool(b => b.Must(musts)))
             .From((input.PageIndex - 1) * input.PageSize)
-            .Size(input.PageSize));
+            .Size(input.PageSize)
+            .TrackTotalHits(true)
+        );
 
         if (!r.IsValid)
         {
@@ -345,7 +347,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             .Index(GlobalConst.ReturnWarningDetailsIndex)
             .Query(q => q.Bool(b => b.Must(musts)))
             .From((input.PageIndex - 1) * input.PageSize)
-            .Size(input.PageSize));
+            .Size(input.PageSize)
+            .TrackTotalHits(true)
+        );
 
         if (!r.IsValid)
         {
@@ -731,7 +735,9 @@ public class WarningDetailsEsRepository : IWarningDetailsEsRepository, ITransien
             .Index(GlobalConst.CompleteWarningDetailsIndex)
             .Query(q => q.Bool(b => b.Must(musts)))
             .From((input.PageIndex - 1) * input.PageSize)
-            .Size(input.PageSize));
+            .Size(input.PageSize)
+            .TrackTotalHits(true)
+        );
 
         if (!r.IsValid)
         {