From 5308e05c80bcd492fc28582e685ac1708b5d2f92 Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Sun, 8 Sep 2024 18:50:53 +0800
Subject: [PATCH] gai

---
 .../java/top/suyiiyii/sims/controller/AdminController.java  | 6 ------
 .../java/top/suyiiyii/sims/controller/RecordController.java | 4 +---
 src/main/java/top/suyiiyii/sims/service/UserService.java    | 3 ++-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/AdminController.java b/src/main/java/top/suyiiyii/sims/controller/AdminController.java
index e72c5c8..23999f2 100644
--- a/src/main/java/top/suyiiyii/sims/controller/AdminController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/AdminController.java
@@ -55,9 +55,3 @@ public class AdminController {
     }
 
 }
-/**
- * request.setAttribute();lUsers();
- * return Result.success(userList);
- * }
- * }
- **/
\ No newline at end of file
diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
index 50f6f00..5476d18 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
@@ -62,9 +62,7 @@ RecordController {
     public Result<List<RecordDto>> record(@RequestParam(defaultValue = "0") int page,
                                           @RequestParam(defaultValue = "10") int size,
                                           HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        String token = (String) session.getAttribute("token");
-        String userId = JwtUtils.extractUserId(token);
+        String userId = String.valueOf(JwtInterceptor.getUserIdFromReq(request));
         List<RecordDto> recordDtos = new ArrayList<>();
         List<Record> records = recordService.getMyAllRecords(page, size, userId);
         for (Record record : records) {
diff --git a/src/main/java/top/suyiiyii/sims/service/UserService.java b/src/main/java/top/suyiiyii/sims/service/UserService.java
index 59c3916..f4b2c98 100644
--- a/src/main/java/top/suyiiyii/sims/service/UserService.java
+++ b/src/main/java/top/suyiiyii/sims/service/UserService.java
@@ -110,7 +110,8 @@ public class UserService {
         userDto.setUserGroup(user.getUserGroup());
         userDto.setStudentId(user.getStudentId());
         userDto.setRoles(new ArrayList<>());
-        //TODO: 获取用户角色
+        List<String> roles = roleMapper.getRolesById(id);
+        userDto.setRoles(roles);
         return userDto;
     }