From c4405bd9e8d0285bcefaead699ed5d4c4a8bbd89 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 12 十月 2023 17:09:52 +0800
Subject: [PATCH] 修改获取nacos配置的地址
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 45fd332..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
@@ -1,9 +1,11 @@
package com.vci.ubcs.system.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
@@ -11,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;
@@ -57,7 +59,13 @@
*/
@Override
public Strategy queryByIsDefault() {
- return this.strategyMapper.queryByIsDefault();
+ return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId()
+ .equals(
+ NacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()
+ );
}
/**
@@ -67,9 +75,20 @@
* @return 鏌ヨ缁撴灉
*/
@Override
- public PageImpl<Strategy> queryAllByPage(Query query) {
+ public IPage<Strategy> queryAllByPage(Query query) {
Page<Strategy> strategyPage = new Page<>(query.getCurrent(), query.getSize());
- return new PageImpl<>(this.strategyMapper.queryAllByPage(strategyPage));
+ // 娣诲姞绉熸埛鏌ヨ鏉′欢
+ IPage<Strategy> strategyIPage = this.strategyMapper.queryAllByPage(
+ strategyPage,
+ AuthUtil.getTenantId()
+ .equals(
+ NacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ )
+ ? null:AuthUtil.getTenantId()
+ );
+ return strategyIPage;
}
/**
@@ -131,7 +150,7 @@
if(Func.isNotEmpty(oldIsDefaultStrategy)){
temp2 = updateUserStrategyDefault(temp1, oldIsDefaultStrategy);
}
- return temp1 && temp2;
+ return temp1 || temp2;
}
}
--
Gitblit v1.9.3