From e8b4201a1c225842a0a638b13f77cb92da766b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 8 May 2026 10:11:34 +0800
Subject: [PATCH] =?UTF-8?q?oms=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0shipperid;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/persistence/SysTableConfigServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java
index 7e7fa228b..731bafc70 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/sysTableConfig/repository/persistence/SysTableConfigServiceImpl.java
@@ -61,8 +61,8 @@ public class SysTableConfigServiceImpl extends ServiceImpl<SysTableConfigMapper,
         if (organizationId == null) {
             throw new ServiceException("组织 ID 不能为空");
         }
-        if (warehouseId == null) {
-            throw new ServiceException("仓库 ID 不能为空");
+        if (warehouseId == null && shipperId == null) {
+            throw new ServiceException("仓库或客户 ID 不能为空");
         }
         return sysTableConfigMapper.listByOrgId(organizationId, warehouseId, shipperId);
     }
@@ -79,8 +79,8 @@ public class SysTableConfigServiceImpl extends ServiceImpl<SysTableConfigMapper,
         if (StringUtils.isBlank(sysTableConfigDTO.getValue())) {
             throw new ServiceException("配置值不能为空");
         }
-        if (sysTableConfigDTO.getWarehouseId() == null) {
-            throw new ServiceException("仓库 ID 不能为空");
+        if (sysTableConfigDTO.getWarehouseId() == null && sysTableConfigDTO.getShipperId() == null) {
+            throw new ServiceException("仓库或客户 ID 不能为空");
         }
 
         // 获取登录人信息