From 32c559cd516e4a7c5309e426886dcff27007f33c Mon Sep 17 00:00:00 2001
From: xiaoCJ <406612557@qq.com>
Date: Mon, 28 Oct 2024 17:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/stu/StuIndexController.java      |  1 +
 .../controller/tea/TeaExamManageController.java |  2 +-
 .../tea/TeaGradeManageController.java           | 17 +++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java
index 937e723..e2cfbc3 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java
@@ -128,6 +128,7 @@ public class StuIndexController {
         StuUserDto stuUserDto = new StuUserDto();
         BeanUtils.copyProperties(stuUser, stuUserDto);
         StuClassExample example =new StuClassExample();
+        example.createCriteria().andClassIdEqualTo(stuUser.getClassId());
         List<StuClass> stuClassList = stuClassMapper.selectByExample(example);
         StuClass stuClass = stuClassList.get(0);
         stuUserDto.setClassName(stuClass.getClassName());
diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java
index 680dd3a..4c2dce6 100644
--- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java
+++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java
@@ -156,7 +156,7 @@ public class TeaExamManageController {
             }
 
             StuClassExample example =new StuClassExample();
-            example.createCriteria().andClassIdIn(list);
+            example.createCriteria().andClassIdIn(list).andSystemOwnerEqualTo(systemOwner);
             List<StuClass> stuClasslist = stuClassMapper.selectByExample(example);
             String s = "";
             for (StuClass stuClass : stuClasslist) {
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 ffc1384..24c51c3 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
@@ -212,7 +212,8 @@ public class TeaGradeManageController {
     @AnonymousAccess
     @PostMapping("/getClassByExamManageId")
     @ApiOperation("考试模式--图表统计接口班级下拉框返回classID和班级名")  //只显示新建实训时添加的班级
-    public ResultEntity<List<Map<String, String>>> getClassByExamManageId(@RequestParam String examManageId) {
+    public ResultEntity<List<Map<String, String>>> getClassByExamManageId(@RequestParam String examManageId,
+                                                                          @RequestParam String systemOwner) {
         TeaAndStudentExamExample teaAndStudentExamExample = new TeaAndStudentExamExample();
         teaAndStudentExamExample.createCriteria().andExamManageIdEqualTo(examManageId);
         List<TeaAndStudentExam> teaAndStudentExams = teaAndStudentExamMapper.selectByExample(teaAndStudentExamExample);
@@ -226,8 +227,8 @@ public class TeaGradeManageController {
             String[] split = classId.split(",");
             List<String> idlist = Arrays.asList(split);
 
-            StuClassExample example =new StuClassExample();
-            example.createCriteria().andClassIdIn(idlist);
+            StuClassExample example = new StuClassExample();
+            example.createCriteria().andClassIdIn(idlist).andSystemOwnerEqualTo(systemOwner);
             List<StuClass> stuClassList = stuClassMapper.selectByExample(example);
 
             for (StuClass stuClass : stuClassList) {
@@ -381,7 +382,7 @@ public class TeaGradeManageController {
                 .collect(Collectors.toMap(StuStudentExamWithBLOBs::getUserid, Function.identity()));
 
         StuClassExample example = new StuClassExample();
-        example.createCriteria().andClassIdIn(classIds);
+        example.createCriteria().andClassIdIn(classIds).andSystemOwnerEqualTo(systemOwner);
         List<StuClass> stuClass = stuClassMapper.selectByExample(example);
 
         // 构建班级ID与班级对象的映射关系
@@ -393,9 +394,12 @@ public class TeaGradeManageController {
             TeaExamAndUserDto teaExamAndUserDto = new TeaExamAndUserDto();
             teaExamAndUserDto.setName(stuUser.getName());
             teaExamAndUserDto.setStudentId(stuUser.getStudentId());
-
             // 从映射关系中获取班级对象
+            if (classMap.get(stuUser.getClassId())==null){
+                continue;
+            }
             StuClass classdata = classMap.get(stuUser.getClassId());
+
             teaExamAndUserDto.setClassName(classdata.getClassName());
 
             StuStudentExamWithBLOBs stuStudentExam = userExamMap.get(stuUser.getUserid());
@@ -482,7 +486,8 @@ public class TeaGradeManageController {
                 StuUser user = userMapper.selectByPrimaryKey(trainingReport.getUserId());
                 trainingReportDto.setName(user.getName());
                 trainingReportDto.setStudentId(user.getStudentId());
-                StuClassExample example =new StuClassExample();
+                StuClassExample example = new StuClassExample();
+                example.createCriteria().andClassIdEqualTo(user.getClassId());
                 List<StuClass> stuClassList = stuClassMapper.selectByExample(example);
                 StuClass stuClass = stuClassList.get(0);
                 trainingReportDto.setClassName(stuClass.getClassName());