From f4f5fd156af9078e7f17889d6db2607bf9a83cbd Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Mon, 3 Mar 2025 02:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarket/service/impl/SmErpCgDdServiceImpl.java      | 4 ++++
 .../supermarket/service/impl/SmErpCgPlanServiceImpl.java    | 6 ++++--
 .../service/impl/SmErpInventoryRecordsServiceImpl.java      | 4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java
index 89f22ca9d..642dbea2a 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgDdServiceImpl.java
+++ b/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)
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java
index 5285dfd25..81d855746 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCgPlanServiceImpl.java
+++ b/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)
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java
index 4f8c003f7..204693377 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpInventoryRecordsServiceImpl.java
+++ b/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)