From 15d6d20c8f5e36f79b420cf6ebdcbbf41cb2cdc8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 18:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
index e44e2e9..f26193f 100644
--- a/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
+++ b/ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
@@ -52,6 +52,7 @@
UserDetail userDetail = new UserDetail();
BeanUtils.copyProperties(user, userDetail);
BeanUtils.copyProperties(company, userDetail);
+ userDetail.setRegisterTime(user.getCreateTime());
return R.ok(userDetail);
}
@@ -83,7 +84,9 @@
@PutMapping("/updateUserDetail")
@Operation(summary = "编辑联系人信息",tags = {"企业端"})
public R<Void> updateUserDetail(@RequestBody UserDetail userDetail) {
- User user = userService.getById(userDetail.getUserId());
+ AppUser appLoginUser = SecurityUtils.getAppLoginUser();
+ userDetail.setUserId(appLoginUser.getUserId());
+ User user = userService.getById(appLoginUser.getUserId());
BeanUtils.copyProperties(userDetail, user);
userService.updateById(user);
return R.ok();
@@ -100,7 +103,7 @@
if (!user.getPhone().equals(updatePhone.getOldPhone())) {
return R.fail("旧手机号错误");
}
- String verifyKey = CacheConstants.PHONE_CODE_KEY + StringUtils.nvl(user.getPhone(), "");
+ String verifyKey = CacheConstants.PHONE_CODE_KEY + StringUtils.nvl(updatePhone.getNewPhone(), "");
String captcha = redisService.getCacheObject(verifyKey);
if (captcha == null) {
throw new CaptchaException("验证码已失效");
@@ -110,8 +113,7 @@
throw new CaptchaException("验证码错误");
}
- String password = SecurityUtils.encryptPassword(updatePhone.getPassword());
- if (!user.getPassword().equals(password)) {
+ if (!SecurityUtils.matchesPassword(updatePhone.getPassword(), user.getPassword())) {
return R.fail("密码错误");
}
user.setPhone(updatePhone.getNewPhone());
--
Gitblit v1.7.1