From a45d0bcbea9078e54da9956c619dacb3c51fe1f1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:30:58 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 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..5acd73f 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;
}
@@ -99,7 +102,7 @@
public boolean submit(Strategy strategy) {
//鑰佺殑榛樿瀵嗙爜绛栫暐
Long oldIsDefaultStrategy = null;
- //鍒ゆ柇鏄惁鎼哄甫id
+ //鍒ゆ柇鏄惁鎼哄甫id锛屼笉鎼哄甫id涓烘柊澧炴搷浣�
if(Func.isEmpty(strategy.getId())){
//鎵ц鏂板
Strategy dbstrategy = this.getOne(Wrappers.<Strategy>query().lambda()
@@ -129,13 +132,18 @@
//妫�楠屽瘑鐮佺瓥鐣ユ槸鍚︾鍚堣姹�
checkPwdStrategy(strategy);
//濡傛灉褰撳墠淇敼璁剧疆涓洪粯璁ゅ瘑鐮佺瓥鐣ワ紝闇�瑕佸皢宸插瓨鍦ㄩ粯璁ゅ瘑鐮佺瓥鐣ヤ慨鏀逛负闈為粯璁�
- if(strategy.getIsDefault().equals("1") || strategy.getIsDefault() == 1){
+ if((strategy.getIsDefault().toString()).equals("1")){
//鏌ヨ鑰佺殑榛樿瀵嗙爜绛栫暐锛屼究浜庝笅闈慨鏀�
- oldIsDefaultStrategy = this.queryByIsDefault().getId();
- this.update(Wrappers.<Strategy>update().lambda()
- .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
- .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
+ Strategy strategyDefault = this.queryByIsDefault();
+ // 鍦ㄦ暟鎹笉鍑虹幇闂鐨勬儏鍐典笅涓嶄細鍑虹幇strategyDefault涓虹┖鐨勬儏鍐�
+ if(Func.isNotEmpty(strategyDefault)){
+ oldIsDefaultStrategy = strategyDefault.getId();
+ this.update(Wrappers.<Strategy>update().lambda()
+ .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
+ .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
+ }
}else {
+ // 閬垮厤鐢ㄦ埛灏嗗敮涓�鐨勯粯璁ゅ瘑鐮佺瓥鐣ユ敼涓洪潪榛樿
if(Func.isEmpty(queryByIsDefault())){
throw new ServiceException("榛樿瀵嗙爜绛栫暐蹇呴』鏈変笖浠呮湁涓�鏉�!");
}
--
Gitblit v1.9.3