From ed1f6cfe669199976cf9f4423ee4e7b440549016 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 14 四月 2025 12:47:32 +0800
Subject: [PATCH] #修改 1. 组拖问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 4ab88da..12e40d6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -49,7 +49,7 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
-        if (waitPakin.getItems().isEmpty()) {
+        if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
             throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
         }
         if (StringUtils.isBlank(waitPakin.getBarcode())) {

--
Gitblit v1.9.1