diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java index 47b5af6c..92a1109e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StationServiceImpl.java @@ -102,6 +102,9 @@ public class StationServiceImpl extends BaseServiceImpl // 合并数据:除wcId和wcName外其他字段相同的记录,wcName用顿号拼接 List mergedList = mergeStationList(stationList); + // 更新 total 为合并后的实际记录数 + page.setTotal(mergedList.size()); + return page.setRecords(mergedList); }