From b33cc5833ea02e3c330ef4d98ba3b5b02126cf73 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 09:55:05 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
index 61feeff..d97a40b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/AdminService.java
@@ -113,25 +113,25 @@
/**
* 淇敼瀵嗙爜
+ *
* @param param
* @return
*/
public boolean updateMyPassword(PwdParam param) {
- if (!StrUtil.equals(param.getNewPass(), param.getConfirmPass())) {
- throw new BusinessException("涓ゆ瀵嗙爜涓嶄竴鑷�");
- }
Long userId = SecurityUtils.getUserId();
Admin admin = getById(userId);
if (admin == null) {
throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
}
-// if (!passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
-// throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘");
-// }
- Admin update = new Admin();
- update.setId(userId);
- update.setPassword(passwordEncoder.encode(param.getNewPass()));
- return updateById(update);
+ //鍒ゆ柇鏃у瘑鐮佷笌鏁版嵁搴撴槸鍚︿竴鑷�
+ if (passwordEncoder.matches(param.getOldPass(), admin.getPassword())) {
+ //鍔犲瘑鏂板瘑鐮�
+ admin.setId(userId);
+ admin.setPassword(passwordEncoder.encode(param.getNewPass()));
+ return updateById(admin);
+ } else {
+ throw new BusinessException("鏃у瘑鐮佷笉姝ｇ‘锛岃閲嶆柊纭瀵嗙爜锛�");
+ }
}
public boolean deleteAdmin(Long adminId) {
--
Gitblit v1.9.3