Merge remote-tracking branch 'origin/saas' into saas

mec-application/src/main/resources/logback-spring.xml

@@ -70,7 +70,7 @@
         <runModel>2</runModel>
     </appender>
 
-    <logger name="com.ym.mec" level="DEBUG"/>
+    <logger name="com.ym.mec" level="WARN"/>
 
     <logger name="com.ym.mec.thirdparty" level="INFO" additivity="false">
         <appender-ref ref="messagefile"/>
@@ -113,8 +113,7 @@
 
     <!--生产环境:输出到文件 -->
     <springProfile name="prod">
-        <root level="DEBUG">
-            <appender-ref ref="stdout"/>
+        <root level="WARN">
             <appender-ref ref="file"/>
             <appender-ref ref="plumelog" />
         </root>

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -168,10 +168,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			teacherAttendance=teacherSignOutDto.getTeacherAttendanceInfo();
 			teacherAttendance.setTeacherId(user.getId());
 			teacherAttendance.setCreateTime(date);
-		}else if(teacherAttendance.getSignInTime() != null){
+		}else if(teacherAttendance.getSignInTime() != null && teacherAttendance.getSignOutTime() != null){
 			throw new BizException("当前课程已签到");
-		} else if (teacherAttendance.getSignOutTime() != null) {
-			throw new BizException("当前课程已签退");
 		}
 
 		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherSignOutDto.getTeacherAttendanceInfo().getCourseScheduleId(),user.getId());