From 64bc126d94c548567fddd88f42a8edfa0c04de93 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 19 May 2022 17:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=88=20=E9=87=8D=E6=9E=84=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=A1=86=E6=9E=B6=E5=BA=95=E5=B1=82=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc/system/controller/TenantController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java index f07a59d1..c9cbb8dc 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/TenantController.java @@ -10,8 +10,8 @@ import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.log.annotation.SysLog; import com.cloud.kicc.common.security.util.SecurityUtils; -import com.cloud.kicc.system.api.entity.Tenant; -import com.cloud.kicc.system.api.entity.User; +import com.cloud.kicc.system.api.entity.*; +import com.cloud.kicc.system.service.RoleTenantService; import com.cloud.kicc.system.service.TenantService; import com.cloud.kicc.system.service.UserService; import lombok.RequiredArgsConstructor; @@ -36,6 +36,7 @@ public class TenantController { private final TenantService tenantService; private final UserService userService; + private final RoleTenantService roleTenantService; private LambdaQueryWrapper getQueryWrapper(Tenant tenant) { return new LambdaQueryWrapper() @@ -84,6 +85,13 @@ public class TenantController { @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('tenant_del')") public R remove(@PathVariable String[] ids) { + // todo: 防止核心多租户删除,暂时处理手段 + if(ArrayUtil.contains(ids, "1523396238015426562")){ + return R.error("不允许删除核心多租户数据!"); + } + if (roleTenantService.count(new LambdaQueryWrapper().in(RoleTenant::getMultiTenantId, ids)) > 0) { + return R.error("多租户已分配,不允许删除"); + } tenantService.removeByIds(Arrays.asList(ids)); return R.ok(); }