From a6e7c82fe5d01b808dfabc179a9527a41e306c6a Mon Sep 17 00:00:00 2001
From: wangys <3401275564@qq.com>
Date: Thu, 27 Nov 2025 17:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/xyzh/auth/service/LoginServiceImpl.java   | 10 ++++++++++
 .../system/src/main/resources/mapper/UserMapper.xml    |  4 ++--
 schoolNewsWeb/src/store/modules/auth.ts                |  3 +++
 schoolNewsWeb/src/types/system/user.ts                 |  1 +
 .../src/views/user/study-plan/StudyTasksView.vue       |  7 ++++---
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java
index 7609a55..cd85f8c 100644
--- a/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java
+++ b/schoolNewsServ/auth/src/main/java/org/xyzh/auth/service/LoginServiceImpl.java
@@ -14,6 +14,7 @@ import org.xyzh.common.core.enums.UserStatus;
 import org.xyzh.common.dto.permission.TbSysPermission;
 import org.xyzh.common.dto.system.TbSysLoginLog;
 import org.xyzh.common.dto.user.TbSysUser;
+import org.xyzh.common.dto.user.TbSysUserInfo;
 import org.xyzh.common.dto.menu.TbSysMenu;
 import org.xyzh.common.exception.auth.AuthException;
 import org.xyzh.common.utils.IDUtils;
@@ -239,6 +240,15 @@ public class LoginServiceImpl implements LoginService {
         loginDomain.setLoginType(loginType);
         loginDomain.setLoginTime(new Date());
         loginDomain.setIpAddress(ipAddress);
+        // 用户信息
+        try {
+            ResultDomain<TbSysUserInfo> resultDomain = userService.getUserInfoById(user.getID());
+            if (resultDomain.isSuccess()) {
+                loginDomain.setUserInfo(resultDomain.getData());
+            }
+        } catch (Exception e) {
+            loginDomain.setUserInfo(null);
+        }
         // 获取用户角色和权限（如果服务可用）
         try {
             ResultDomain<UserDeptRoleVO> resultDomain = roleService.getDeptRolesByUserId(user.getID());
diff --git a/schoolNewsServ/system/src/main/resources/mapper/UserMapper.xml b/schoolNewsServ/system/src/main/resources/mapper/UserMapper.xml
index fc1120a..e529694 100644
--- a/schoolNewsServ/system/src/main/resources/mapper/UserMapper.xml
+++ b/schoolNewsServ/system/src/main/resources/mapper/UserMapper.xml
@@ -65,13 +65,13 @@
     </sql>
 
     <sql id="FullUser_Column_List">
-        id, user_id, avatar, gender, family_name, given_name, full_name, student_id,id_card, address, 
+        id, user_id, avatar, gender, family_name, given_name, full_name,level, student_id,id_card, address, 
         create_time, update_time, delete_time, deleted, status
     </sql>
 
     <!-- 用户信息字段 -->
     <sql id="UserInfo_Column_List">
-        id, user_id, avatar, gender, family_name, given_name, full_name, student_id,id_card, address, 
+        id, user_id, avatar, gender, family_name, given_name, full_name, level,student_id,id_card, address, 
         create_time, update_time, delete_time, deleted
     </sql>
 
diff --git a/schoolNewsWeb/src/store/modules/auth.ts b/schoolNewsWeb/src/store/modules/auth.ts
index 8d081eb..4a02944 100644
--- a/schoolNewsWeb/src/store/modules/auth.ts
+++ b/schoolNewsWeb/src/store/modules/auth.ts
@@ -129,6 +129,9 @@ const authModule: Module<AuthState, any> = {
     user: (state) => {
       return state.loginDomain?.user || null;
     },
+    userinfo: (state) => {
+      return state.loginDomain?.userInfo || null;
+    },
     
     // 获取用户角色
     userRoles: (state) => {
diff --git a/schoolNewsWeb/src/types/system/user.ts b/schoolNewsWeb/src/types/system/user.ts
index 9a3bab2..8c61310 100644
--- a/schoolNewsWeb/src/types/system/user.ts
+++ b/schoolNewsWeb/src/types/system/user.ts
@@ -32,6 +32,7 @@ export interface SysUserInfo extends BaseDTO {
   /** 用户名（迁移到userInfo中，便于统一展示） */
   username?: string;
   studentId?: string;
+  level?: string;
   /** 真实姓名 */
   realName?: string;
   /** 昵称 */
diff --git a/schoolNewsWeb/src/views/user/study-plan/StudyTasksView.vue b/schoolNewsWeb/src/views/user/study-plan/StudyTasksView.vue
index 581ce3d..743a990 100644
--- a/schoolNewsWeb/src/views/user/study-plan/StudyTasksView.vue
+++ b/schoolNewsWeb/src/views/user/study-plan/StudyTasksView.vue
@@ -9,8 +9,8 @@
           <div class="progress-info">
             <div class="progress-header">
               <span class="progress-text">当前学习进度（{{ completedCount }}/{{ totalCount }}）</span>
-              <span class="progress-percent">{{ progressPercent }}%</span>
-              <span class="progress-level">{{ userLevel }}</span>
+              <!-- <span class="progress-percent">{{ progressPercent }}%</span> -->
+              <!-- <span class="progress-level">{{ userLevel }}</span> -->
             </div>
             <div class="progress-bar-container">
               <div class="progress-bar">
@@ -147,7 +147,8 @@ const taskList = ref<TaskItemVO[]>([]);
 const totalCount = ref(0);
 const completedCount = ref(0);
 const pendingCount = ref(0);
-const userLevel = ref('Level1');
+// const userLevel = "Lv"+useStore().getters['auth/userinfo'].level;
+
 
 // 计算进度百分比
 const progressPercent = computed(() => {