Procházet zdrojové kódy

分页问题修复

xucaiqin před 2 roky
rodič
revize
22bfa95d31

+ 5 - 2
sckw-modules/sckw-payment/src/main/java/com/sckw/payment/service/KwpSettlementOfflineService.java

@@ -88,6 +88,8 @@ public class KwpSettlementOfflineService {
         if (CollectionUtils.isEmpty(settlementOfflineLogisticsList)) {
             return new PageRes<>(new PageInfo<>());
         }
+        PageInfo<SettlementOfflineDto> pageInfo = new PageInfo<>(settlementOfflineLogisticsList);
+
         //增加对应创建人和更新人名称
         for (SettlementOfflineDto entity : settlementOfflineLogisticsList) {
             entity.setCreateByText("创建人名称");
@@ -123,7 +125,7 @@ public class KwpSettlementOfflineService {
             return settlementOfflineVo;
         }).collect(Collectors.toList());
 
-        return new PageRes<>(new PageInfo<>(collect));
+        return PageRes.build(pageInfo, collect);
     }
 
 
@@ -271,6 +273,7 @@ public class KwpSettlementOfflineService {
         }
         Map<Long, UserCacheResDto> map = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         DecimalFormat df = new DecimalFormat("0.00");
+        PageInfo<SettlementOfflineDto> pageInfo = new PageInfo<>(settlementOfflineDto);
         //指定返回值
         List<SettlementOfflineVo> collect = settlementOfflineDto.stream().map(a -> {
             SettlementOfflineVo settlementOfflineVo = new SettlementOfflineVo();
@@ -299,7 +302,7 @@ public class KwpSettlementOfflineService {
             settlementOfflineVo.setTopayPrice(df.format(Objects.isNull(a.getTopayPrice()) ? new BigDecimal("0.0") : a.getTopayPrice()));
             return settlementOfflineVo;
         }).collect(Collectors.toList());
-        return new PageRes<>(new PageInfo<>(collect));
+        return PageRes.build(pageInfo, collect);
     }
 
     /**