|
|
@@ -252,7 +252,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
CourseTable swapCourseTable = courseTableMapper.selectById(swapCourseId);
|
|
|
try {
|
|
|
JsonObject preCheck = getExtendPreCheck(swapDate, courseTable, swapCourseTable);
|
|
|
- if(!preCheck.get("data").getAsBoolean()){
|
|
|
+ if(!preCheck.get("data").getAsBoolean() && !preCheck.get("msg").isJsonNull()){
|
|
|
return preCheck.get("msg").getAsString();
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
@@ -263,7 +263,7 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
CourseTable courseTable = courseTableMapper.selectById(courseId);
|
|
|
try {
|
|
|
JsonObject jsonObject = substitutePreTestin(subTeacherId, courseTable);
|
|
|
- if(!jsonObject.get("data").getAsBoolean()){
|
|
|
+ if(!jsonObject.get("data").getAsBoolean() && !jsonObject.get("msg").isJsonNull()){
|
|
|
return jsonObject.get("msg").getAsString();
|
|
|
}
|
|
|
} catch (Exception e) {
|