From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 13 九月 2023 09:09:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java index a75e548..7359525 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java @@ -15,7 +15,6 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.data.domain.PageImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +42,9 @@ @Resource private IUserClient userClient; + /** + * nacos涓婃媺鍙栫殑閰嶇疆 + */ @Resource private NacosConfigCache nacosConfigCache; @@ -63,7 +65,13 @@ */ @Override public Strategy queryByIsDefault() { - return this.strategyMapper.queryByIsDefault(); + return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId() + .equals( + nacosConfigCache + .getAdminUserInfo() + .getTenantId() + ) ? null:AuthUtil.getTenantId() + ); } /** @@ -83,7 +91,8 @@ nacosConfigCache .getAdminUserInfo() .getTenantId() - ) ? null:AuthUtil.getTenantId() + ) + ? null:AuthUtil.getTenantId() ); return strategyIPage; } -- Gitblit v1.9.3