Merge remote-tracking branch 'origin/master'

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

@@ -190,14 +190,16 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 			throw new BizException("课程已结束");
 		}
 
-		if(StringUtils.length(remark)>150){
-			throw new BizException("字符长度超限");
-		}
-		
 		Date date = new Date();
 		
-		if(DateUtil.addHours(date, 2).after(courseSchedule.getStartClassTime())){
-			throw new BizException("开课2个小时之前才可以请假");
+		int hours = 2;
+		String str = sysConfigDao.findConfigValue(SysConfigService.ADVANCE_LEAVE_HOURS);
+		if (StringUtils.isNotBlank(str)) {
+			hours = Integer.parseInt(str);
+		}
+		
+		if(DateUtil.addHours(date, hours).after(courseSchedule.getStartClassTime())){
+			throw new BizException("开课{}个小时之前才可以请假",hours);
 		}
 		
 		StudentAttendance studentAttendance  = studentAttendanceDao.findByStatusAndCourseScheduleId(userId,courseScheduleId.intValue());

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

@@ -289,12 +289,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			createVipGroupCourseScheInfo(vipGroupApplyBaseInfoDto.getId());
 		}
 
-		SysUser systemUser = sysUserFeignService.queryUserById(systemId);
 		Set<Integer> roleIds = new HashSet<>(1);
 		roleIds.add(SysUserRole.OPERATION_EXECUTIVE);
 		Map<String,Long> memo = new HashMap<>(1);
 		memo.put("vipGroupId",vipGroupApplyBaseInfoDto.getId());
 		if (systemId != null){
+			SysUser systemUser = sysUserFeignService.queryUserById(systemId);
 			sysMessageService.batchSeoMessage(roleIds,MessageTypeEnum.BACKSTAGE_VIP_COURSE_APPLY, JSONObject.toJSONString(memo),systemUser.getUsername(),sysUser.getUsername());
 		}else {
 			sysMessageService.batchSeoMessage(roleIds,MessageTypeEnum.BACKSTAGE_TEACHER_APPLY_VIP, JSONObject.toJSONString(memo),sysUser.getUsername());