From 310cd4ce72ed5ebff23b2994a156ec0e353ecca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Mon, 26 Aug 2024 11:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E6=88=B7=E5=AD=97=E5=85=B8=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysDictTypeController.java      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java
index 16ac755cf..1eb3a2fe6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java
@@ -139,13 +139,16 @@ public class SysDictTypeController extends BaseController {
     /**
      * 同步租户字典
      */
-    @GetMapping("asyncTenantDict")
+    @GetMapping("syncTenantDict")
     @Log(title = "同步租户字典", businessType = BusinessType.INSERT)
     @Transactional(rollbackFor = Exception.class)
-    @SaCheckRole("superadmin")
-    public R<Void> asyncTenantDict(String tenantId) {
+    @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+    public R<Void> syncTenantDict(String tenantId) {
+        if (!TenantHelper.isEnable()) {
+            return R.fail("当前未开启租户模式");
+        }
         if (TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
-            throw new ServiceException("超级管理员无须同步字典");
+            return R.fail("超级管理员无须同步字典");
         }
         //查询超管所有字典类型
         List<SysDictTypeVo> typeVos = TenantHelper.dynamic(TenantConstants.DEFAULT_TENANT_ID, dictTypeService::selectDictTypeAll);