From 126a0cc1554f671c25484e5f5ada54de50e256c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98zhengbw=E2=80=99?= <‘q59323016@qq.com’> Date: Tue, 18 Feb 2025 10:40:34 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E6=88=B7=E5=A5=97=E9=A4=90=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A0=A1=E9=AA=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 82f688a84793409dd0f2f4e59830ebe36f242fae. --- .../yudao/module/system/enums/ErrorCodeConstants.java | 2 +- .../system/service/tenant/TenantPackageServiceImpl.java | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 9949171..1228131 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -108,7 +108,7 @@ public interface ErrorCodeConstants { // ========== 租户套餐 1002016000 ========== ErrorCode TENANT_PACKAGE_NOT_EXISTS = new ErrorCode(1002016000, "租户套餐不存在"); - ErrorCode TENANT_PACKAGE_USED = new ErrorCode(1002016001, "租户正在使用该套餐，请给租户重新设置套餐后再尝试删除或者禁用"); + ErrorCode TENANT_PACKAGE_USED = new ErrorCode(1002016001, "租户正在使用该套餐，请给租户重新设置套餐后再尝试删除"); ErrorCode TENANT_PACKAGE_DISABLE = new ErrorCode(1002016002, "名字为【{}】的租户套餐已被禁用"); // ========== 错误码模块 1002017000 ========== diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java index 7f55ae4..4e6e601 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java @@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import java.util.List; -import java.util.Objects; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; @@ -52,14 +51,6 @@ public class TenantPackageServiceImpl implements TenantPackageService { public void updateTenantPackage(TenantPackageUpdateReqVO updateReqVO) { // 校验存在 TenantPackageDO tenantPackage = validateTenantPackageExists(updateReqVO.getId()); - // 判断启用状态是否更改 - if (!Objects.equals(tenantPackage.getStatus(), updateReqVO.getStatus())) { - // 如果状态更改为禁用 - if (updateReqVO.getStatus() == 1) { - //判断是否存在使用该套餐的租户，存在则不可禁用该套餐 - validateTenantUsed(tenantPackage.getId()); - } - } // 更新 TenantPackageDO updateObj = TenantPackageConvert.INSTANCE.convert(updateReqVO); tenantPackageMapper.updateById(updateObj);