From 424d9748add1a2ade5ca33e8981e5bc4e7a03ab6 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index c0b00d0..c4d657b 100644
--- a/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -3,6 +3,8 @@
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.Sm4Utils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -196,6 +198,7 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
+ user.setPassword(Sm4Utils.decryptSm4(user.getPassword())) ;
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
--
Gitblit v1.8.0