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 不能为空");
         }
 
         // 获取登录人信息