|
|
@@ -2341,10 +2341,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
|
|
|
LocalDateTime companyUserEndDateTime = companyUserTimeRange[1];
|
|
|
|
|
|
// 确定实际使用的开始和结束时间
|
|
|
- LocalDateTime effectiveStartTime = companyUserStartDateTime != null ?
|
|
|
- companyUserStartDateTime : periodDays.getStartDateTime();
|
|
|
- LocalDateTime effectiveEndTime = companyUserEndDateTime != null ?
|
|
|
- companyUserEndDateTime : periodDays.getEndDateTime();
|
|
|
+// LocalDateTime effectiveStartTime = companyUserStartDateTime != null ?
|
|
|
+// companyUserStartDateTime : periodDays.getStartDateTime();
|
|
|
+// LocalDateTime effectiveEndTime = companyUserEndDateTime != null ?
|
|
|
+// companyUserEndDateTime : periodDays.getEndDateTime();
|
|
|
+ LocalDateTime effectiveStartTime = periodDays.getStartDateTime();
|
|
|
+ LocalDateTime effectiveEndTime = periodDays.getEndDateTime();
|
|
|
// 检查时间范围和状态
|
|
|
log.error("传入参数:开始时间:{},结束时间:{},periodDays={}",effectiveStartTime,effectiveEndTime,periodDays);
|
|
|
return DateUtil.isWithinRangeSafe(LocalDateTime.now(), effectiveStartTime, effectiveEndTime)&& periodDays.getStatus() == 1;
|