From d3e9a09cb54017a8063e5bfe3ace5012f66f3130 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 三月 2025 18:34:34 +0800
Subject: [PATCH] 修改统计bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index e6eb5af..6397d3e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -1,19 +1,5 @@
package com.ruoyi.system.controller;
-import java.util.Arrays;
-
-import com.ruoyi.system.service.ISysUserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.FileTypeUtils;
@@ -28,6 +14,16 @@
import com.ruoyi.system.api.domain.SysFile;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
+import com.ruoyi.system.dto.UpdatePassword;
+import com.ruoyi.system.service.ISysUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+import java.util.Objects;
/**
* 个人信息 业务处理
@@ -103,12 +99,24 @@
@ApiOperation(value = "个人信息-修改密码")
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PostMapping("/updatePwd")
- public AjaxResult updatePwd(String oldPassword, String newPassword)
+ public AjaxResult updatePwd(@RequestBody UpdatePassword updatePassword)
{
+ String newPassword = updatePassword.getNewPassword();
+ String oldPassword = updatePassword.getOldPassword();
+ String username = updatePassword.getUsername();
System.err.println(oldPassword);
System.err.println(newPassword);
- String username = SecurityUtils.getUsername();
- SysUser user = userService.selectUserByUserName(username);
+// String username = SecurityUtils.getUsername();
+ SysUser user =null;
+ if (updatePassword.getType()==1){
+ user = userService.selectUserByUserName(username);
+ }else{
+ user = userService.selectUserShopByUserName(username);
+ }
+ if (Objects.isNull(user))
+ {
+ return error("未查询到该账号");
+ }
String password = user.getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
{
@@ -118,8 +126,7 @@
{
return error("新密码不能与旧密码相同");
}
- if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
- {
+ if (updatePassword.getType()==1&&userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 更新缓存用户密码
// LoginUser loginUser = SecurityUtils.getLoginUser();
// SysUser sysUser = loginUser.getSysUser();
@@ -127,6 +134,15 @@
// tokenService.setLoginUser(loginUser);
return success();
}
+ if (updatePassword.getType()==2&&userService.resetUserShopPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
+ // 更新缓存用户密码
+// LoginUser loginUser = SecurityUtils.getLoginUser();
+// SysUser sysUser = loginUser.getSysUser();
+// loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+// tokenService.setLoginUser(loginUser);
+ return success();
+ }
+
return error("修改密码异常，请联系管理员");
}
--
Gitblit v1.7.1