材料费对比消除空指针隐患

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -97,6 +97,8 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
             List<CLFCompareResultVO> resultList = redisResultList.subList(startId, endId);
             if (!resultList.isEmpty()) {
                 int pages = 0;
+                pageNo = Optional.ofNullable(pageNo).orElse(0);
+                pageSize = Optional.ofNullable(pageSize).orElse(redisResultList.size());
                 if (redisResultList.size() < pageSize) {
                     pages = 1;
                 } else {
@@ -105,10 +107,8 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
                     if (o != 0) i = i + 1;
                     pages = i;
                 }
-                page.setPages(pages);
                 page.setRecords(resultList);
-                pageNo = Optional.ofNullable(pageNo).orElse(0);
-                pageSize = Optional.ofNullable(pageSize).orElse(redisResultList.size());
+                page.setPages(pages);
                 page.setCurrent(pageNo);
                 page.setSize(pageSize);
                 page.setTotal(redisResultList.size());
@@ -238,7 +238,6 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
             if (o != 0) i = i + 1;
             pages = i;
         }
-
         page.setCurrent(pageNo);
         page.setSize(pageSize);
         page.setTotal(clfCompareResultVOS.size());