From 8859977761f5c316dbebbc0ebf495ae7151b1b19 Mon Sep 17 00:00:00 2001
From: huCareYou <hu_care_you@163.com>
Date: Tue, 26 Aug 2025 13:44:52 +0800
Subject: [PATCH] =?UTF-8?q?[fix]:=20-=20=E7=A7=BB=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=AD=BE=E7=BA=A6=E3=80=81=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E7=AD=BE=E7=BA=A6=E5=92=8C=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E7=9A=84=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E6=8E=A5=E5=8F=A3=E4=B8=AD=E7=9A=84=20@SaCheckRole=20?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=9C=AA=E9=80=9A=E8=BF=87=E6=97=B6=E6=9C=AA=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=A4=B1=E8=B4=A5=E5=8E=9F=E5=9B=A0=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=A4=E6=96=AD=20-=20=E5=9C=A8=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=AD=BE=E7=BA=A6=E6=97=B6=E6=B8=85=E7=A9=BA=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/controller/SysTenantController.java  | 6 ------
 .../dromara/system/service/impl/SysTenantServiceImpl.java   | 3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

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) {