zouxuan 5 years ago
parent
commit
7b5107f301

+ 2 - 5
edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamSubjectServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 @Service
 @Service
@@ -41,10 +42,6 @@ public class ExamSubjectServiceImpl extends BaseServiceImpl<Long, ExamSubject> i
 	@Override
 	@Override
 	public List<Subject> getStudentExamSubjects(Integer examId) {
 	public List<Subject> getStudentExamSubjects(Integer examId) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		List<Subject> studentExamSubjects = examSubjectDao.getStudentExamSubjects(examId, sysUser.getId());
-		if(studentExamSubjects == null || studentExamSubjects.size() == 0){
-			return new ArrayList<>();
-		}
-		return studentExamSubjects;
+		return examSubjectDao.getStudentExamSubjects(examId, sysUser.getId());
 	}
 	}
 }
 }

+ 1 - 1
edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamSubjectMapper.xml

@@ -103,7 +103,7 @@
 	<select id="getStudentExamSubjects" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">
 	<select id="getStudentExamSubjects" resultMap="com.keao.edu.user.dao.SubjectDao.Subject">
 		SELECT s.* FROM exam_registration er
 		SELECT s.* FROM exam_registration er
 		LEFT JOIN subject s on er.subject_id_ = s.id_
 		LEFT JOIN subject s on er.subject_id_ = s.id_
-		WHERE er.examination_basic_id_ = #{examId} AND er.student_id_ = #{studentId}
+		WHERE er.examination_basic_id_ = #{examId} AND er.student_id_ = #{studentId} AND er.subject_id_ = s.id_
 		GROUP BY s.id_
 		GROUP BY s.id_
 	</select>
 	</select>
 </mapper>
 </mapper>