From 869a5b02c515dca42022c53647edbfbef8c2c3c1 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 11 十月 2023 15:39:26 +0800 Subject: [PATCH] 租户条件从常量类配置方式修改为nacos上拉取配置 --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java index 31572a7..f4c1dc7 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/TenantController.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.vci.ubcs.system.cache.NacosConfigCache; import com.vci.ubcs.system.entity.Tenant; import com.vci.ubcs.system.entity.TenantPackage; import com.vci.ubcs.system.service.ITenantPackageService; @@ -69,6 +70,8 @@ private final ITenantPackageService tenantPackageService; + private final NacosConfigCache nacosConfigCache; + /** * 璇︽儏 */ @@ -95,7 +98,7 @@ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) { QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class); - IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); + IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(pages); } @@ -108,7 +111,7 @@ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) { QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant); - List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); + List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(list); } -- Gitblit v1.9.3