From 0f9c143d46aee209079c8029275c7b90501b3508 Mon Sep 17 00:00:00 2001 From: BenjaminNH <1249376374@qq.com> Date: Wed, 2 Jul 2025 17:22:21 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=9C=89=E9=A2=84=E7=BA=A6=E8=AE=BE=E5=A4=87=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=80=83=E8=99=91=E9=80=9A=E8=BF=87=E4=BD=86=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=8D=8F=E5=8A=A9=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReservationServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/github/benjamin/equipreservebackend/service/impl/ReservationServiceImpl.java b/src/main/java/github/benjamin/equipreservebackend/service/impl/ReservationServiceImpl.java index 02f7881..56ba9f8 100644 --- a/src/main/java/github/benjamin/equipreservebackend/service/impl/ReservationServiceImpl.java +++ b/src/main/java/github/benjamin/equipreservebackend/service/impl/ReservationServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -48,7 +49,7 @@ public class ReservationServiceImpl implements ReservationService { LocalDate endTime = now.plusDays(days); return reservationMapper.selectList(new LambdaQueryWrapper() .in(Reservation::getDeviceId, devicesIds) - .eq(Reservation::getStatus, ReservationStatus.APPROVED) + .in(Reservation::getStatus, List.of(ReservationStatus.APPROVED, ReservationStatus.APPROVED_ASSIST)) .between(Reservation::getStartTime, now, endTime)); } @@ -71,6 +72,13 @@ public class ReservationServiceImpl implements ReservationService { Page reservations = reservationMapper.selectPage(pageRequest, new LambdaQueryWrapper() .eq(Reservation::getUserId, userId) .orderByDesc(Reservation::getCreatedTime)); + Page res = PageUtil.copyPage(reservations); + if (reservations.getRecords().isEmpty()) { + res.setTotal(0); + res.setRecords(Collections.EMPTY_LIST); + return res; + } + // 获取设备名称 List deviceIds = reservations.getRecords().stream() .map(Reservation::getDeviceId) @@ -88,7 +96,7 @@ public class ReservationServiceImpl implements ReservationService { .distinct() .toList(); - Page res = PageUtil.copyPage(reservations); + List vos; Map deviceAdminMap = userMapper.selectList(new LambdaQueryWrapper() .in(User::getId, deviceAdminIDs)) @@ -106,7 +114,7 @@ public class ReservationServiceImpl implements ReservationService { public List getUnavailableTimes(Long id) { List reservations = reservationMapper.selectList(new LambdaQueryWrapper() .eq(Reservation::getDeviceId, id) - .eq(Reservation::getStatus, "APPROVED") + .in(Reservation::getStatus, List.of(ReservationStatus.APPROVED, ReservationStatus.APPROVED_ASSIST)) .gt(Reservation::getEndTime, LocalDate.now())); return reservations.stream()