diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java index 34f46d6a2..70236831b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysTenantController.java @@ -133,8 +133,6 @@ public class SysTenantController extends BaseController { /** * 提交签约 */ - @Tag(name ="提交签约") - @SaCheckRole(TenantConstants.TENANT_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:submitSign") @Log(title = "租户管理", businessType = BusinessType.UPDATE) @PostMapping("/submitSign/{tenantId}") @@ -146,8 +144,6 @@ public class SysTenantController extends BaseController { /** * 审核提交的签约 */ - @Tag(name ="审核提交的签约") - @SaCheckRole(TenantConstants.TENANT_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:reviewSubmitted") @Log(title = "租户管理", businessType = BusinessType.UPDATE) @PostMapping("/reviewSubmitted") @@ -160,8 +156,6 @@ public class SysTenantController extends BaseController { /** * 确认审核通过的签约 */ - @Tag(name ="确认审核通过的签约") - @SaCheckRole(TenantConstants.TENANT_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:confirmedSign") @Log(title = "租户管理", businessType = BusinessType.UPDATE) @PostMapping("/confirmedSign/{tenantId}") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index ebd01a55b..0b228c092 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -800,6 +800,7 @@ public class SysTenantServiceImpl implements ISysTenantService { SysTenantExtend updateTenantExtend = new SysTenantExtend(); updateTenantExtend.setId(tenantExtend.getId()); updateTenantExtend.setSignStatus(TenantSignStatus.TO_BE_REVIEWED.getStatus()); + updateTenantExtend.setFailureReason(""); return tenantExtendMapper.updateById(updateTenantExtend); } @@ -809,7 +810,7 @@ public class SysTenantServiceImpl implements ISysTenantService { Assert.notNull(tenantExtend, () -> new ServiceException("无效的租户信息")); Assert.isTrue(TenantSignStatus.TO_BE_REVIEWED.getStatus().equals(tenantExtend.getSignStatus()), () -> new ServiceException("当前状态不可审核")); Boolean isPass = bo.getIsPass(); - Assert.isTrue(!isPass && StrUtil.isNotBlank(bo.getFailureReason()), () -> new ServiceException("请填写审核未通过原因")); + Assert.isTrue(isPass || StrUtil.isNotBlank(bo.getFailureReason()), () -> new ServiceException("请填写审核未通过原因")); SysTenantExtend updateTenantExtend = new SysTenantExtend(); updateTenantExtend.setId(tenantExtend.getId()); if (isPass) {