修复

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java

@@ -25,6 +25,7 @@ import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collections;
 import java.util.List;
@@ -181,6 +182,9 @@ public class SmErpCgDdServiceImpl extends ServiceImpl<SmErpCgDdMapper, SmErpCgDd
     public Object pageScope(Page page, LambdaQueryWrapper<SmErpCgDdEntity> wrapper) {
         Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of());
         List<SmErpCgDdEntity> records = pageData.getRecords();
+        if (CollectionUtils.isEmpty(records)){
+            return pageData;
+        }
         // 2. 提前收集所有主表ID（去重处理）
         Set<Long> planIds = records.stream()
                 .map(SmErpCgDdEntity::getId)

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java

@@ -1,6 +1,5 @@
 package com.bsd.pjcloud.supermarket.service.impl;
 
-import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,6 +25,7 @@ import com.bsd.pjcloud.supermarket.vo.cgplan.SmErpCgPlanItemVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -180,7 +180,9 @@ public class SmErpCgPlanServiceImpl extends ServiceImpl<SmErpCgPlanMapper, SmErp
     public Object pageScope(Page page, LambdaQueryWrapper<SmErpCgPlanEntity> wrapper) {
         Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of());
         List<SmErpCgPlanEntity> records = pageData.getRecords();
-
+        if (CollectionUtils.isEmpty(records)){
+            return pageData;
+        }
         // 2. 提前收集所有主表ID（去重处理）
         Set<Long> planIds = records.stream()
                 .map(SmErpCgPlanEntity::getId)

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java

@@ -24,6 +24,7 @@ import com.bsd.pjcloud.supermarket.vo.inventoryrecord.InventoryRecordVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -102,6 +103,9 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl<SmErpInventory
     public Object pageScope(Page page, LambdaQueryWrapper<SmErpInventoryRecordsEntity> wrapper) {
         Page pageData = baseMapper.selectPageByScope(page, wrapper, DataScope.of());
         List<SmErpInventoryRecordsEntity> records = pageData.getRecords();
+        if (CollectionUtils.isEmpty(records)){
+            return pageData;
+        }
         // 2. 提前收集所有主表ID（去重处理）
         Set<Long> planIds = records.stream()
                 .map(SmErpInventoryRecordsEntity::getId)