From 3b7e529f424cad2c42920d44c3c99d84665aa352 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 17 Jul 2025 14:45:42 +0800
Subject: [PATCH] usercode bug

---
 .../main/java/com/bonus/auth/controller/TokenController.java | 5 +++--
 .../src/main/resources/mapper/system/SysUserMapper.xml       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
index b85bb13..fb1a800 100644
--- a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
+++ b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java
@@ -97,7 +97,8 @@ public class TokenController {
         if (!config.isAdmin()) {
             return R.ok(false);
         }
-        passwordValidatorService.validateLoginParameters(form.getUsername(), form.getPassword());
+        String password = Sm4Utils.decrypt(form.getPassword());
+        passwordValidatorService.validateLoginParameters(form.getUsername(), password);
         //通过用户名获取人员信息
         R<LoginUser> userResult = remoteUserService.getUserInfo(form.getUsername(), SecurityConstants.INNER);
         // 验证用户查询结果
@@ -108,7 +109,7 @@ public class TokenController {
         // 验证用户状态
         passwordValidatorService.validateUserStatus(form.getUsername(), user);
         // 验证密码
-        passwordService.validate(user, form.getPassword(), System.currentTimeMillis());
+        passwordService.validate(user, password, System.currentTimeMillis());
         // 处理IP校验
         passwordValidatorService.handleIpValidation(form.getUsername(), user);
         if (userResult.getData() == null || R.FAIL == userResult.getCode()) {
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 16a6afe..04a3df6 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -354,7 +354,7 @@
     <update id="updateUser" parameterType="SysUser">
         update sys_user
         <set>
-            <if test="userCode != null and userCode != 0">user_code = #{userCode},</if>
+            <if test="userCode != null">user_code = #{userCode},</if>
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
             <if test="userType != null and userType != ''">user_type = #{userType},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>