Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1780,7 +1780,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         SysUser sysUser = sysUserFeignService.queryUserById(practiceGroup.getStudentId());
 
         practiceGroup.setCoursesStartDate(allCourseDates.get(0));
-        practiceGroup.setCoursesExpireDate(DateUtil.addMinutes(allCourseDates.get(3), practiceCourseMinutes));
+        practiceGroup.setCoursesExpireDate(courseExpireDate);
         Teacher teacher = teacherService.getDetail(practiceGroup.getUserId());
         if(Objects.isNull(teacher)){
             throw new BizException("老师不存在");

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

@@ -73,7 +73,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(StudentCourseHomework bean) {
-		if(Objects.isNull(bean)){
+		if(Objects.isNull(bean)||Objects.isNull(bean.getId())){
 			throw new BizException("作业不存在");
 		}
 		super.update(bean);