当前周次调整

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -55,6 +55,7 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.time.DayOfWeek;
 import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -162,7 +163,13 @@ public class ScheduleController {
     @ApiOperation(value="获取当前周次")
     @SaCheckPermission("schedule:detail")
     public RT<Integer> currentWeek(CourseTableDto dto){
-        List<BaseSemester> semesterList = semesterService.list(new QueryWrapper<BaseSemester>().lambda().orderByDesc(BaseSemester::getStartDate));
+        List<BaseSemester> semesterList = semesterService.list(
+                new QueryWrapper<BaseSemester>().lambda()
+                        .eq(BaseSemester::getDeleteMark, DeleteMark.NODELETE.getCode())
+                        .le(BaseSemester::getEndDate, LocalDate.now())
+                        .ge(BaseSemester::getStartDate, LocalDate.now())
+                        .orderByDesc(BaseSemester::getStartDate)
+        );
         BaseSemester baseSemester = semesterList.get(0);
         LocalDateTime now = LocalDateTime.now();
         if(dto.getScheduleDate() != null){