周次查询调整

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

@@ -379,10 +379,23 @@ public class ScheduleController {
     @ApiOperation(value="获取周次列表")
     @SaCheckPermission("schedule:detail")
     public RT<List<ScheduleWeekVo>> weekList(@Valid ScheduleWeekDto dto){
-        List<BaseSemester> semesterList = semesterService.list(new QueryWrapper<BaseSemester>().lambda().orderByDesc(BaseSemester::getStartDate));
-        BaseSemester baseSemester = semesterList.get(0);
+
+        BaseSemester baseSemester;
         if(dto.getSemesterId() != null){
             baseSemester = semesterService.getById(dto.getSemesterId());
+        }else{
+            LocalDateTime now = LocalDateTime.now();
+            List<BaseSemester> semesterList = semesterService.list(
+                    new QueryWrapper<BaseSemester>().lambda()
+                            .eq(BaseSemester::getDeleteMark, DeleteMark.NODELETE.getCode())
+                            .le(BaseSemester::getStartDate, now)
+                            .ge(BaseSemester::getEndDate, now)
+                            .orderByDesc(BaseSemester::getStartDate)
+            );
+            if(semesterList.isEmpty()){
+                return RT.ok(new ArrayList<>());
+            }
+            baseSemester = semesterList.get(0);
         }
         LocalDateTime startDateTime = LocalDateTime.ofInstant(baseSemester.getStartDate().toInstant(), ZoneId.systemDefault());
         LocalDateTime endDateTime = LocalDateTime.ofInstant(baseSemester.getEndDate().toInstant(), ZoneId.systemDefault());