From ded0c9939f7302c7f5807e92dd476bce8c0703ef Mon Sep 17 00:00:00 2001
From: tortoise <2891138827@qq.com>
Date: Mon, 26 Aug 2024 22:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sims/common/InterceptorConfig.java        |  3 ---
 .../sims/controller/AdminController.java      |  1 +
 .../sims/controller/RecordController.java     | 14 ++++++++---
 .../top/suyiiyii/sims/mapper/UserMapper.java  |  2 ++
 .../suyiiyii/sims/service/UserService.java    | 25 ++++---------------
 5 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java b/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java
index 69a7ff4..5ab170e 100644
--- a/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java
+++ b/src/main/java/top/suyiiyii/sims/common/InterceptorConfig.java
@@ -16,9 +16,6 @@ import top.suyiiyii.sims.service.RoleService;
  */
 @Configuration
 public class InterceptorConfig extends WebMvcConfigurationSupport {
-    @Autowired
-    private RoleService roleService;
-
 
     @Autowired
     private JwtInterceptor jwtInterceptor;
diff --git a/src/main/java/top/suyiiyii/sims/controller/AdminController.java b/src/main/java/top/suyiiyii/sims/controller/AdminController.java
index 412dd6c..8aa1be9 100644
--- a/src/main/java/top/suyiiyii/sims/controller/AdminController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/AdminController.java
@@ -32,6 +32,7 @@ public class AdminController {
     @AuthAccess(allowRoles = {"admin"})
     @GetMapping("/findAllUsersWithRoles")
     public Result findAllUsersWithRoles() {
+
         List<User> userList = roleService.findAllUsersWithRoles();
         return Result.success(userList);
     }
diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
index 287c961..f4d169e 100644
--- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java
@@ -108,6 +108,7 @@ RecordController {
         recordService.addRecord(record);
         return Result.msg("添加成功");
     }
+    @AuthAccess(allowRoles = {"admin"})
     @Operation(summary = "模糊查询奖惩记录")
     @GetMapping("/admin/likeRecords")
     public Result<List<RecordDto>> searchRecords(
@@ -115,17 +116,24 @@ RecordController {
             @RequestParam(defaultValue = "10") int size,
             String username,Integer studentId, String userGroup, String grade,String roleName) {
         Integer s1=studentId;
+        List<Integer> studentIds = new ArrayList<>();
+        List<Record> records=new ArrayList<>();
+        studentIds.add(studentId);
         if(roleName!="") {
             //rolename查用户id
             Integer userId = roleService.getIdByrolename(roleName);
-            //  用户id查记录
-          //  s1 = userService.selectStudentIdByUserId(userId);
+         //     用户id查记录
+          s1 = userService.getStudentIdByUserId(userId);
+            studentIds.add(s1);
         }
         if(username!="") {
             //username查用户StudentId
             s1= roleService.getStudentIdByUsername(username);
+            studentIds.add(s1);
+        }
+        for (Integer Sid : studentIds) {
+            records.addAll(recordService.getRecordsLike(page,size,Sid,userGroup,grade));
         }
-        List<Record> records=recordService.getRecordsLike(page,size,s1,userGroup,grade);
         List<RecordDto> RecordDtos = new ArrayList<>();
         for (Record record : records) {
             RecordDto RecordDto = modelMapper.map(record, RecordDto.class);
diff --git a/src/main/java/top/suyiiyii/sims/mapper/UserMapper.java b/src/main/java/top/suyiiyii/sims/mapper/UserMapper.java
index 1d49de4..22dd1f1 100644
--- a/src/main/java/top/suyiiyii/sims/mapper/UserMapper.java
+++ b/src/main/java/top/suyiiyii/sims/mapper/UserMapper.java
@@ -96,4 +96,6 @@ public interface UserMapper extends BaseMapper<User> {
     @Select("select student_id from user where id = #{userId}")
     String getStudentIdById(String userId);
 
+    @Select("select student_id from user where id = #{userId}")
+    Integer getStudentIdByUserId(Integer userId);
 }
diff --git a/src/main/java/top/suyiiyii/sims/service/UserService.java b/src/main/java/top/suyiiyii/sims/service/UserService.java
index 82c3f2f..d96543e 100644
--- a/src/main/java/top/suyiiyii/sims/service/UserService.java
+++ b/src/main/java/top/suyiiyii/sims/service/UserService.java
@@ -45,14 +45,6 @@ public class UserService {
     @Autowired
     private ModelMapper modelMapper;
 
-    public void addUser(User user) {
-        userMapper.addUser(user);
-    }
-
-    public void updateUser(User user) {
-        userMapper.updateUser(user);
-    }
-
     public void deleteUser(int id) {
         userMapper.deleteUser(id);
     }
@@ -106,13 +98,6 @@ public class UserService {
         rbacService.addRoleWithUserId(user.getId(), "user");
     }
 
-    public User selectByUsername(String username) {
-        return userMapper.selectByUserName(username);
-    }
-
-    public void updatePassword(User user) {
-        userMapper.updatePassword(user);
-    }
 
     public List<UserDto> findAllUsers() {
         List<User> users = userMapper.selectAll();
@@ -161,13 +146,13 @@ public class UserService {
         return UserDto;
     }
 
-
-
+/*
     public List<Role> selectRolesById(Integer studentId) {
         return roleMapper.selectRolesById(studentId);
     }
+*/
 
-
-
-
+    public Integer getStudentIdByUserId(Integer userId) {
+        return userMapper.getStudentIdByUserId(userId);
+    }
 }