From 43ed3e6b9fc2ff32d879dc4550fe9acb3427a9a5 Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Thu, 31 Oct 2024 15:00:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tea/TeaGradeManageController.java          |  4 +++-
 .../controller/tea/UserController.java         | 18 +++++++++++-------
 .../mapper/StuUserMapper.java                  | 16 ++++++++--------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java
index 24c51c3..6e5ca78 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java
@@ -94,7 +94,9 @@ public class TeaGradeManageController {
         }
 
         //存储用户信息
-        List<StuUser> stuUsers = userMapper.selectByPrimaryKeys(userIds);
+        StuUserExample example =new StuUserExample();
+        example.createCriteria().andSystemOnwerEqualTo(systemOwner).andUseridIn(userIds);
+        List<StuUser> stuUsers = userMapper.selectByExample(example);
         for (StuUser stuUser : stuUsers) {
             userMap.put(stuUser.getUserid(), stuUser);
         }
diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
index ba10401..2e6a164 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java
@@ -131,10 +131,10 @@ public class UserController {
             map.put("classId", user.getClassId());
             map.put("userId", user.getUserid());
             map.put("zyuserid", user.getZyUserid());
-            try{
+            try {
                 String uuid = getIPAndPlace(request, user.getName(), user.getUserid(), user.getStudentId());
                 map.put("logId", uuid);
-            }catch (Exception e){
+            } catch (Exception e) {
 
             }
             map.put("token", token);
@@ -153,13 +153,18 @@ public class UserController {
             LoginResult loginResult = LoginResult.create(jwtUser, token);
             Map<String, Object> map = new HashMap<>();
             map.put("name", loginResult.getName());
+
+            StuUserExample stuUserExample = new StuUserExample();
+            stuUserExample.createCriteria().andSystemOnwerEqualTo(systemOwner).andZyUseridEqualTo(Integer.parseInt(loginResult.getUserId()));
+            List<StuUser> stuUsers = stuUserMapper.selectByExample(stuUserExample);
+            String userid = stuUsers.get(0).getUserid();
             map.put("username", loginResult.getUsername());
             map.put("roleId", loginResult.getRoleId());
             map.put("schoolId", loginResult.getSchoolId());
             if (StringUtils.isNotBlank(loginResult.getUserId())) {
                 map.put("classId", loginResult.getClassId());
             }
-            map.put("userId", loginResult.getUserId());
+            map.put("userId", userid);
             map.put("token", token);
             String uuid = getIPAndPlace(request, loginResult.getName(), loginResult.getUserId(), jwtUser.getStudentId());
             map.put("logId", uuid);
@@ -228,7 +233,6 @@ public class UserController {
             StuClass stuClass = new StuClass();
             ZYUserInfo zyUserInfo = zyUserInfoList.get(i);
             Integer roleId = zyUserInfo.getRoleId();   //3教师  4学生
-
             Integer zyUserId = zyUserInfo.getUserId();
             String username = zyUserInfo.getUsername();   // studentid
             String name = zyUserInfo.getName();
@@ -366,12 +370,12 @@ public class UserController {
     @AnonymousAccess
     @PostMapping("/selectAllClassNameBySchoolId")
     @ApiOperation("班级下拉框")
-    public ResultEntity<List<Map<String, String>>> selectAllClassNameBySchoolId(@RequestParam String schoolId,@RequestParam String systemOwner) {
-        StuUserExample example =new StuUserExample();
+    public ResultEntity<List<Map<String, String>>> selectAllClassNameBySchoolId(@RequestParam String schoolId, @RequestParam String systemOwner) {
+        StuUserExample example = new StuUserExample();
         example.createCriteria().andSchoolIdEqualTo(schoolId);
         List<StuUser> list = stuUserMapper.selectByExample(example);
         String schoolName = list.get(0).getSchoolName();
-        return new ResultEntity<>(classMapper.selectAllClassNameBySchoolId(schoolName,systemOwner));
+        return new ResultEntity<>(classMapper.selectAllClassNameBySchoolId(schoolName, systemOwner));
     }
 
 
diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java
index 03d985a..8d8935a 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java
@@ -57,14 +57,14 @@ public interface StuUserMapper {
 //    @Select("select count(*) from stu_userinfo where class_id = #{s}")
 //    int selectNumByClass(@Param("s") String s);
 
-    @Select("<script>" +
-            "SELECT userid, name FROM stu_userinfo WHERE userid IN ("
-            + "<foreach collection='userIds' separator=',' item='id'>"
-            + "#{id}"
-            + "</foreach>"
-            + ")" +
-            "</script>")
-    List<StuUser> selectByPrimaryKeys(@Param("userIds") List<String> userIds);
+//    @Select("<script>" +
+//            "SELECT userid, name FROM stu_userinfo WHERE userid IN ("
+//            + "<foreach collection='userIds' separator=',' item='id'>"
+//            + "#{id}"
+//            + "</foreach>"
+//            + ")" +
+//            "</script>")
+//    List<StuUser> selectByPrimaryKeys(@Param("userIds") List<String> userIds);
 
     List<StuUser> selectTeaExamAndUserDtos(@Param("schoolId")String schoolId,
                                            @Param("keyWord") String keyWord,