From 2526190b209e74f3f882eaf19cc95d333589d7b8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 14 一月 2026 10:04:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
index c0d9b5b..e5e7f56 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -481,7 +481,7 @@
if (dto.getState() == 1 && goods.getClinicPurchasePrice() == null) {
return R.fail("操作失败，请设置供应商分佣比例后再启用");
}
- if (dto.getState() == 1 && goods.getStateUser() == 1 && user.getRoleType() == 4) {
+ if (dto.getState() == 1 && Objects.nonNull(goods.getStateUser()) && goods.getStateUser() == 1 && user.getRoleType() == 4) {
return R.fail("操作失败，平台禁用商品不可启用");
}
if (user.getRoleType() == 1) {
--
Gitblit v1.7.1