wangliang 4 jaren geleden
bovenliggende
commit
25cd78d40a

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -164,7 +164,7 @@ public class TBUserController {
      * @return
      * @throws NoSuchAlgorithmException
      */
-    public Result userLoginCommon(TBUser user) throws NoSuchAlgorithmException {
+    private Result userLoginCommon(TBUser user) throws NoSuchAlgorithmException {
         //停用
         if (user.getEnable().intValue() == 0) {
             throw new BusinessException(ExceptionResultEnum.USER_ENABLE);

+ 3 - 3
themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -144,7 +144,7 @@ public class TEStudentController {
         String password = String.valueOf(mapParameter.get("password"));
 
         QueryWrapper<TEStudent> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(TEStudent::getIdentity, identity);
+        wrapper.lambda().eq(TEStudent::getIdentity, identity).eq(TEStudent::getOrgId, tbOrg.getId());
         TEStudent user = teStudentService.getOne(wrapper);
         //学生不存在
         if (Objects.isNull(user)) {
@@ -179,7 +179,7 @@ public class TEStudentController {
      * @return
      * @throws NoSuchAlgorithmException
      */
-    public Result userLoginCommon(TEStudent teStudent, Long examId, Long orgId) throws NoSuchAlgorithmException {
+    private Result userLoginCommon(TEStudent teStudent, Long examId, Long orgId) throws NoSuchAlgorithmException {
         //停用
         if (teStudent.getEnable().intValue() == 0) {
             throw new BusinessException(ExceptionResultEnum.STUDENT_ENABLE);
@@ -351,7 +351,7 @@ public class TEStudentController {
      * @param examStudentId
      * @return
      */
-    public ExamUnFinishBean unFinishCommon(Long recordId, ExamCacheBean ec, ExamStudentCacheBean examStudentCacheBean, ExamActivityCacheBean examActivityCacheBean, Long examStudentId) {
+    private ExamUnFinishBean unFinishCommon(Long recordId, ExamCacheBean ec, ExamStudentCacheBean examStudentCacheBean, ExamActivityCacheBean examActivityCacheBean, Long examStudentId) {
         ExamCourseCacheBean examCourseCacheBean = teExamCourseService.getExamCourseCacheBean(ec.getId(), examStudentCacheBean.getCourseCode());
         TEExamActivityDto teExamActivityDto = new TEExamActivityDto(ec, examActivityCacheBean, examStudentCacheBean, examStudentId, examCourseCacheBean);
         Gson gson = new Gson();