From c84991603548ca07bdcb589bf61ab230a6fb9f3e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 07 九月 2023 13:57:52 +0800
Subject: [PATCH] getCodeRuleByClassifyOid接口修改
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 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 3a5be0e..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
@@ -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,8 +13,8 @@
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;
import org.springframework.transaction.annotation.Transactional;
@@ -42,6 +43,12 @@
private IUserClient userClient;
/**
+ * nacos涓婃媺鍙栫殑閰嶇疆
+ */
+ @Resource
+ private NacosConfigCache nacosConfigCache;
+
+ /**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
*
* @param id 涓婚敭
@@ -58,7 +65,13 @@
*/
@Override
public Strategy queryByIsDefault() {
- return this.strategyMapper.queryByIsDefault();
+ return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()
+ );
}
/**
@@ -70,7 +83,18 @@
@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