From f21ae344a9f99c542841e9e464fddedb7059f514 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 05 九月 2023 09:05:19 +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 | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 3a5be0e..a75e548 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.common.constant.CommonConstant;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.Strategy;
import com.vci.ubcs.system.mapper.StrategyMapper;
import com.vci.ubcs.system.service.IStrategyService;
@@ -12,6 +13,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
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;
@@ -40,6 +42,9 @@
@Resource
private IUserClient userClient;
+
+ @Resource
+ private NacosConfigCache nacosConfigCache;
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
@@ -70,7 +75,17 @@
@Override
public IPage<Strategy> queryAllByPage(Query query) {
Page<Strategy> strategyPage = new Page<>(query.getCurrent(), query.getSize());
- return this.strategyMapper.queryAllByPage(strategyPage);
+ // 娣诲姞绉熸埛鏌ヨ鏉′欢
+ IPage<Strategy> strategyIPage = this.strategyMapper.queryAllByPage(
+ strategyPage,
+ AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()
+ );
+ return strategyIPage;
}
/**
--
Gitblit v1.9.3