523096025 2 mēneši atpakaļ
vecāks
revīzija
fbba6f82ff

+ 5 - 4
huimv-farm/src/main/java/vip/xiaonuo/money/service/impl/MoneyBusinessServiceImpl.java

@@ -234,10 +234,11 @@ public class MoneyBusinessServiceImpl extends ServiceImpl<MoneyBusinessMapper, M
             dsBusAllParam.setBalanceOnYear(calculateYOYZiJinYvE(getDouble(dsBusAllParam.getBalance()),getDouble(lastDsBus.getBalance()) ));
             dsBusAllParam.setBalanceIsOn(getDouble(lastDsBus.getBalance()) <getDouble(dsBusAllParam.getBalance()));
         }
-        DsBusAllParam dsBusAllParam = busAllParams.get(0);
-        dsBusAllParam.setBalanceIsOn(true);
-        dsBusAllParam.setBalanceOnYear("0%");
-
+        if (ObjectUtil.isNotEmpty(busAllParams)){
+            DsBusAllParam dsBusAllParam = busAllParams.get(0);
+            dsBusAllParam.setBalanceIsOn(true);
+            dsBusAllParam.setBalanceOnYear("0%");
+        }
 
         return busAllParams;
     }

+ 7 - 3
huimv-farm/src/main/java/vip/xiaonuo/sale/service/impl/SaleTargetServiceImpl.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.sale.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -373,10 +374,13 @@ public class SaleTargetServiceImpl extends ServiceImpl<SaleTargetMapper, SaleTar
         queryWrapper.groupBy("customer_name");
         Page<SaleTarget> targets = targetMapper.selectPage(page, queryWrapper);
         List<SaleTarget> records = targets.getRecords();
-        for (int i = 0; i < pageSize; i++) {
-            SaleTarget workstopPlan = records.get(i);
-            workstopPlan.setId((pageNum-1) *pageSize + i+ 1 );
+        if (ObjectUtil.isNotEmpty(records)){
+            for (int i = 0; i < pageSize; i++) {
+                SaleTarget workstopPlan = records.get(i);
+                workstopPlan.setId((pageNum-1) *pageSize + i+ 1 );
+            }
         }
+
         return targets;
     }