From 0cab15970c0203bbcc1a72e9ec19469d298380ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 12 十月 2023 15:59:56 +0800
Subject: [PATCH] 修改bug提交
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..f7ad297 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,9 +42,6 @@
@Resource
private IUserClient userClient;
- @Resource
- private NacosConfigCache nacosConfigCache;
-
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
*
@@ -63,7 +59,13 @@
*/
@Override
public Strategy queryByIsDefault() {
- return this.strategyMapper.queryByIsDefault();
+ return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId()
+ .equals(
+ NacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()
+ );
}
/**
@@ -80,10 +82,11 @@
strategyPage,
AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
- ) ? null:AuthUtil.getTenantId()
+ )
+ ? null:AuthUtil.getTenantId()
);
return strategyIPage;
}
--
Gitblit v1.9.3