Merge remote-tracking branch 'origin/master' into test

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceAlgorithmChargingHisController.java

@@ -85,6 +85,9 @@ public class DeviceAlgorithmChargingHisController {
         page.getPage().setSize(-1);
         page.setCurMercId(MercAuthUtils.getMercId());
         PageBean<DeviceAlgorithmChargingHistoryDto.PageByTopMercVO> pageVoPageBean = R.feignCheckData(deviceAlgorithmChargingHistoryService.pageByTopMerc(page));
+        if (pageVoPageBean == null) {
+            return R.ok(0);
+        }
         List<DeviceAlgorithmChargingHistoryDto.PageByTopMercVO> records = pageVoPageBean.getRecords();
         int totalAgentMoney = 0;
         if (CollUtil.isNotEmpty(records)) {

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceChargingHistoryController.java

@@ -84,6 +84,9 @@ public class DeviceChargingHistoryController {
         page.getPage().setSize(-1);
         page.setCurMercId(MercAuthUtils.getMercId());
         PageBean<DeviceChargingHistoryDto.PageVo> pageVoPageBean = R.feignCheckData(deviceChargingHistoryService.pageByTopMerc(page));
+        if (pageVoPageBean == null) {
+            return R.ok(0);
+        }
         List<DeviceChargingHistoryDto.PageVo> records = pageVoPageBean.getRecords();
         int totalAgentMoney = 0;
         if (CollUtil.isNotEmpty(records)) {

device-api-service-merc-mini/src/main/java/com/xy/controller/DeviceSimChargeController.java

@@ -111,6 +111,9 @@ public class DeviceSimChargeController {
         page.getPage().setSize(-1);
         page.setCurMercId(MercAuthUtils.getMercId());
         PageBean<DeviceSimChargeDto.PageByTopMercVO> pageVoPageBean = R.feignCheckData(deviceSimChargeService.pageByTopMerc(page));
+        if (pageVoPageBean == null) {
+            return R.ok(0);
+        }
         List<DeviceSimChargeDto.PageByTopMercVO> records = pageVoPageBean.getRecords();
         int totalAgentMoney = 0;
         if (CollUtil.isNotEmpty(records)) {