From 47dc1bef06f17e498b573b6098d56739607e44d1 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期二, 17 十月 2023 12:03:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 6cc6556..28b0663 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -526,6 +526,9 @@
 			pwdupdateday = dateToDay(pwdUpdateTime);
 		}
 		Strategy strategy = sysClient.getByUserId(userId).getData();
+		if(Func.isNotEmpty(strategy)){
+			throw new ServiceException("瀵嗙爜绛栫暐鏌ヨ涓虹┖锛岃妫�鏌ュ綋鍓嶇鎴蜂笅鏄惁瀛樺湪榛樿瀵嗙爜绛栫暐锛�");
+		}
 		//鏄惁鎻愰啋閫氳繃鏈�鍚庝竴娆′慨鏀瑰瘑鐮佺殑鏃堕棿鍔犱笂杩囨湡鏃堕棿鍑忓幓褰撳墠鏃堕棿锛屽鏋滃皬浜庤繃鏈熸彁閱掓椂闂村氨杩涜鎻愰啋锛屽鏋�<=0灏辨彁閱掑繀椤讳慨鏀瑰瘑鐮�
 		long reminder = pwdupdateday+strategy.getExpirationTime()-dateToDay(new Date());
 		//鎻愰啋鐢ㄦ埛蹇呴』淇敼瀵嗙爜
@@ -570,6 +573,21 @@
 		return list.stream().distinct().collect(Collectors.toList());
 	}
 
+	/***
+	 * 鏇存柊鐢ㄦ埛鍚敤鍋滅敤鐘舵��
+	 * @param userIds
+	 * @param status
+	 * @return
+	 */
+	@Override
+	public boolean updateUserStatus(String userIds, boolean status) {
+		Integer user_status=0;
+		if(!status){
+			user_status=1;
+		}
+		return this.update(Wrappers.<User>lambdaUpdate().in(User::getId, Func.toLongList(userIds)).set(User::getUserStatus,user_status));
+	}
+
 	/**
 	 * 鏃ユ湡鏃堕棿鏍煎紡杞ぉ
 	 * @param date

--
Gitblit v1.9.3