Merge remote-tracking branch 'origin/master'

common/src/main/java/com/jpsoft/education/modules/wechat/entity/AccessToken.java

@@ -3,6 +3,7 @@ package com.jpsoft.education.modules.wechat.entity;
 import lombok.Data;
 
 /**
+ *
  * @author 墨鱼_mo
  * @date 2019-12-11 15:29
  */

common/src/main/java/com/jpsoft/education/modules/wechat/vo/UserInfo.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 /**
  * 微信通用接口凭证
- * 
  * @author lt
  * @date 2013-08-08
  */

web/src/main/java/com/jpsoft/education/modules/mobile/controller/TeacherApiController.java

@@ -112,7 +112,7 @@ public class TeacherApiController {
                 Tclass tclass = tclassService.get(ss.getClassId());
                 ss.setClassName(tclass.getClassName());
 
-                ClassRoom classRoom = classRoomService.get(ss.getClassroom());
+                ClassRoom classRoom = classRoomService.get(tclass.getClassroom());
                 ss.setClassroomN(classRoom.getName());
 
                 List<BuyLog> buyLogList = buyLogService.findByStatusAndClassId("1",ss.getClassId());
@@ -177,6 +177,7 @@ public class TeacherApiController {
 
             ClassRoom classRoom = classRoomService.get(tclass.getClassroom());
 
+
             List<Student> studentList = studentService.findByStatusAndClassId("1",scheduleSheet.getClassId());
             for(Student student : studentList){
                 RollcallLog rollcallLog = rollcallLogService.findByStudentIdAndSheetId(student.getStudentId(),scheduleSheet.getSheetId());