消费记录BUG

share-system/src/main/java/share/system/service/impl/SConsumptionRecordsServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import share.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,10 +59,19 @@ public class SConsumptionRecordsServiceImpl implements ISConsumptionRecordsServi
     public List<SConsumptionRecordsVo> selectSConsumptionRecordsList(SConsumptionRecords sConsumptionRecords)
     {
         List<SConsumptionRecordsVo> sConsumptionRecordsList = sConsumptionRecordsMapper.selectSConsumptionRecordsList(sConsumptionRecords);
+        if (CollectionUtils.isEmpty(sConsumptionRecordsList)) {
+            return new ArrayList<>();
+        }
         //获取消费记录的用户id集合
         List<Long> collect = sConsumptionRecordsList.stream().map(SConsumptionRecords::getConsumerId).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(collect)) {
+            return new ArrayList<>();
+        }
         //获取用户id集合的用户信息
         List<SConsumer> sConsumers = sConsumerMapper.selectBatchIds(collect);
+        if (CollectionUtils.isEmpty(sConsumers)) {
+            return new ArrayList<>();
+        }
         List<Long> oredrIds = sConsumptionRecordsList.stream().map(SConsumptionRecords::getOrderId).collect(Collectors.toList());
         List<SOrder> sOrders = sOrderMapper.selectBatchIds(oredrIds);
         sConsumptionRecordsList.stream().forEach(item -> {