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 |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 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 f7ad297..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
@@ -102,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()
@@ -132,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