From 8b8305b82f23b672023d8a3d1d1d7030af3f110c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 15:44:02 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdatePassword.java | 2 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 18 +++++++++++++++---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 1 +
ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml | 5 ++++-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 1 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 4 ++++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java | 1 +
7 files changed, 28 insertions(+), 4 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 76e191a..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
@@ -107,7 +107,12 @@
System.err.println(oldPassword);
System.err.println(newPassword);
// String username = SecurityUtils.getUsername();
- SysUser user = userService.selectUserByUserName(username);
+ SysUser user =null;
+ if (updatePassword.getType()==1){
+ user = userService.selectUserByUserName(username);
+ }else{
+ user = userService.selectUserShopByUserName(username);
+ }
if (Objects.isNull(user))
{
return error("未查询到该账号");
@@ -121,8 +126,15 @@
{
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();
+// loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword));
+// tokenService.setLoginUser(loginUser);
+ return success();
+ }
+ if (updatePassword.getType()==2&&userService.resetUserShopPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) {
// 更新缓存用户密码
// LoginUser loginUser = SecurityUtils.getLoginUser();
// SysUser sysUser = loginUser.getSysUser();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdatePassword.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdatePassword.java
index acb3306..04dcba3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdatePassword.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdatePassword.java
@@ -13,4 +13,6 @@
private String newPassword;
private String oldPassword;
+ // 1平台 2门店
+ private Integer type;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index 1e31dc7..e773b0e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -91,6 +91,7 @@
* @return 结果
*/
int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
+ int resetUserShopPwd(@Param("userName") String userName, @Param("password") String password);
/**
* 通过用户ID删除用户
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
index 5e980b4..f69a56a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
@@ -184,6 +184,7 @@
* @return 结果
*/
int resetUserPwd(String userName, String password);
+ int resetUserShopPwd(String userName, String password);
/**
* 通过用户ID删除用户
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index c1a051d..0d15ced 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -372,6 +372,10 @@
public int resetUserPwd(String userName, String password) {
return userMapper.resetUserPwd(userName, password);
}
+ @Override
+ public int resetUserShopPwd(String userName, String password) {
+ return userMapper.resetUserShopPwd(userName, password);
+ }
/**
* 新增用户角色信息
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
index 8aa82dc..fc40357 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapping/system/SysUserMapper.xml
@@ -268,7 +268,10 @@
</update>
<update id="resetUserPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
- update sys_user set password = #{password} where user_name = #{userName}
+ update sys_user set password = #{password} where user_name = #{userName} and role_type =1
+ </update>
+ <update id="resetUserShopPwd" parameterType="com.ruoyi.system.api.domain.SysUser">
+ update sys_user set password = #{password} where user_name = #{userName} and role_type =2
</update>
<update id="deleteUserById" parameterType="Long">
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
index f069467..f50b3e3 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
@@ -88,6 +88,7 @@
// ArrayList<Long> userIds = new ArrayList<>();
// userIds.add(appUser.getId());
// getUserAncestorList(appUser,userIds,new ArrayList<>(),appUserList);
+ agentApplication.setVipId(agentApplication.getApplicationVipId());
return R.ok(agentApplication);
}
public void getUserAncestorList(AppUser user,List<Long> userIds, List<AppUser> children,List<AppUser> list) {
--
Gitblit v1.7.1