From 7d95a14b718e8692ddc13d057cb6d9406b9aebf4 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Wed, 7 May 2025 15:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/utils/request.js        | 12 +++++++++---
 sgzb-ui/src/views/resetPassword.vue |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js
index cd64081c..6b737b08 100644
--- a/sgzb-ui/src/utils/request.js
+++ b/sgzb-ui/src/utils/request.js
@@ -8,9 +8,15 @@ import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
 
-const systemConfig = JSON.parse(localStorage.getItem('systemConfig')) || {
-  requestConfig: { encryptRequest: false, checkIntegrity: false, encryptResponse: false }
-};
+const systemConfig = (() => {
+  try {
+    const config = JSON.parse(localStorage.getItem('systemConfig'));
+    return config || { requestConfig: { encryptRequest: false, checkIntegrity: false, encryptResponse: false } };
+  } catch (error) {
+    console.warn('Failed to parse systemConfig from localStorage:', error);
+    return { requestConfig: { encryptRequest: false, checkIntegrity: false, encryptResponse: false } };
+  }
+})()
 
 let downloadLoadingInstance;
 // 是否显示重新登录
diff --git a/sgzb-ui/src/views/resetPassword.vue b/sgzb-ui/src/views/resetPassword.vue
index 4906be0c..1d62c497 100644
--- a/sgzb-ui/src/views/resetPassword.vue
+++ b/sgzb-ui/src/views/resetPassword.vue
@@ -120,7 +120,8 @@ export default {
                 if (valid) {
                     const oldPassword = encrypt(this.user.oldPassword)
                     const newPassword = encrypt(this.user.newPassword)
-                    resetUserPwd(0, newPassword).then((response) => {
+                    const userId = sessionStorage.getItem('userId')
+                    resetUserPwd(userId, newPassword).then((response) => {
                         this.$modal.msgSuccess('修改成功, 请重新登录')
                         // 重新登录
                         this.$store.dispatch('LogOut').then(() => {