From f1dd87abd55b8dd95a206c80c0a185d4d4919324 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 25 三月 2023 19:17:17 +0800
Subject: [PATCH] !311 fix 修复超管切换租户后 新增用户校验的租户不正确 Merge pull request !311 from Yjoioooo/5.X
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
index 8721111..14f2113 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java
@@ -214,7 +214,7 @@
* @param packageId 绉熸埛濂楅id
* @return 瑙掕壊id
*/
- public Long createTenantRole(String tenantId, Long packageId) {
+ private Long createTenantRole(String tenantId, Long packageId) {
// 鑾峰彇绉熸埛濂楅
SysTenantPackage tenantPackage = sysTenantPackageMapper.selectById(packageId);
if (ObjectUtil.isNull(tenantPackage)) {
@@ -272,6 +272,18 @@
}
/**
+ * 鏍￠獙绉熸埛鏄惁鍏佽鎿嶄綔
+ *
+ * @param tenantId 绉熸埛ID
+ */
+ @Override
+ public void checkTenantAllowed(String tenantId) {
+ if (ObjectUtil.isNotNull(tenantId) && TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) {
+ throw new ServiceException("涓嶅厑璁告搷浣滅鐞嗙鎴�");
+ }
+ }
+
+ /**
* 鎵归噺鍒犻櫎绉熸埛
*/
@CacheEvict(cacheNames = CacheNames.SYS_TENANT, allEntries = true)
--
Gitblit v1.9.3