From b582ef0232ee09d96ec25ac15a20f00ef1922a98 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Thu, 5 Mar 2026 23:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B9=E7=9B=AE=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Layout/components/editPswd.vue | 63 ++++++-------------
 .../mini/mybigscreen/Auth/userController.java | 13 ++--
 2 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/screen-vue/src/components/Layout/components/editPswd.vue b/screen-vue/src/components/Layout/components/editPswd.vue
index b22dc46..9f56f89 100644
--- a/screen-vue/src/components/Layout/components/editPswd.vue
+++ b/screen-vue/src/components/Layout/components/editPswd.vue
@@ -58,52 +58,27 @@ const pwdRules = reactive({
 })
 
 const submitForm = async () => {
-  if (!isMounted.value || !pwdFormRef.value) return
-  if (submitPromise) {
-    submitPromise = null
-    return
-  }
-
-  submitPromise = new Promise(async (resolve) => {
-    try {
-      let valid = true
-      await pwdFormRef.value.validate().catch(() => {
-        valid = false
-        ElMessage.error('表单验证失败，请检查输入内容')
-      })
-
-      if (!valid || !isMounted.value) {
-        submitPromise = null
-        return resolve(false)
-      }
-
-      let confirmResult = false
-      if (!confirmResult || !isMounted.value) {
-        submitPromise = null
-        return resolve(false)
-      }
-	  const reqParams = {
-		  oldPasswd :pwdForm.oldPassword,
-		  password : pwdForm.newPassword,
-		  userId : userStore.loginUser?.userId || '',
-	  }
-	  const res = await updatePasswd(reqParams);
-      await new Promise(res => setTimeout(res, 800))
-      if (isMounted.value) {
-        emit('success')
-        resolve(true)
-      }
-    } catch (error) {
-      if (isMounted.value) {
-		  console.log(error)
-      }
-      resolve(false)
-    } finally {
+  if (!isMounted.value || !pwdFormRef.value || submitPromise) return
+  try {
+    submitPromise = true
+    await pwdFormRef.value.validate()
+    const reqParams = {
+      oldPasswd: pwdForm.oldPassword,
+      password: pwdForm.newPassword,
+      userId: userStore.loginUser?.userId || ''
+    }
+    const res = await updatePasswd(reqParams)
+    await new Promise(res => setTimeout(res, 800))
+    isMounted.value && emit('success')
+    return true
+  } catch (error) {
+	  console.error('修改密码接口异常：', error)
+    return false
+  } finally {
+    if (isMounted.value) {
       submitPromise = null
     }
-  })
-
-  return submitPromise
+  }
 }
 
 const resetForm = () => {
diff --git a/src/main/java/com/mini/mybigscreen/Auth/userController.java b/src/main/java/com/mini/mybigscreen/Auth/userController.java
index fbf3f4f..407c179 100644
--- a/src/main/java/com/mini/mybigscreen/Auth/userController.java
+++ b/src/main/java/com/mini/mybigscreen/Auth/userController.java
@@ -1,5 +1,6 @@
 package com.mini.mybigscreen.Auth;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mini.mybigscreen.Model.LoginRequest;
 import com.mini.mybigscreen.Model.Result;
@@ -30,9 +31,9 @@ public class userController {
      */
     @PostMapping("/userLogin")
     public Result<?> getUserInfo(@RequestBody LoginRequest loginRequest, HttpServletRequest request) {
-        QueryWrapper<HomeUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_name", loginRequest.getUsername())
-                .eq("password", AesUtil.encrypt(loginRequest.getPassword()));
+        LambdaQueryWrapper<HomeUser> queryWrapper = new LambdaQueryWrapper<HomeUser>()
+                .eq(HomeUser::getUserName, loginRequest.getUsername())
+                .eq(HomeUser::getPassword, AesUtil.encrypt(loginRequest.getPassword()));
         HomeUser user = userService.getOne(queryWrapper, true);
         if (user != null) {
             String token = KeyUtil.ObjKey(125, 0);
@@ -50,9 +51,9 @@ public class userController {
 
     @PostMapping("/editPasswd")
     public Result<?> getUserSave(String userId, String oldPasswd, String password) {
-        QueryWrapper<HomeUser> query = new QueryWrapper<>();
-        query.eq("user_id", userId)
-                .eq("password", AesUtil.encrypt(oldPasswd));
+        LambdaQueryWrapper<HomeUser> query = new LambdaQueryWrapper<HomeUser>()
+                .eq(HomeUser::getUserId, userId)
+                .eq(HomeUser::getPassword, AesUtil.encrypt(password));
         HomeUser user = userService.getOne(query, true);
         if (ObjectUtils.isEmpty(user)) {
             return Result.error("旧密码输入错误");