From 41173ff751a6518900ba8e1b35bea3319c633dc0 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 17 三月 2025 18:23:50 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java index fa0abc5..71683cd 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java @@ -1357,7 +1357,7 @@ .ne(Bookings::getId,bookings.getId()) )>Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�"); - }; + } if(bookingsMapper.selectCount(new QueryWrapper<Bookings>() .lambda() @@ -1368,7 +1368,7 @@ .eq(Bookings::getRoomId,bookings.getRoomId()) )>Constants.ZERO){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曞紑濮嬩細璁�"); - }; + } }else{ if(bookings.getStartTime().getTime() > System.currentTimeMillis()){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�"); @@ -1386,6 +1386,7 @@ .set(Bookings::getDoneInfo,"鍏朵粬浼氳寮�濮嬶紝鑷姩鍏抽棴") .apply(" ( END_TIME < now() or ( END_TIME > now() and START_TIME < now() and START_TIME_REAL is null ) )") .eq(Bookings::getStatus,Constants.ZERO) + .ne(Bookings::getId,bookings.getId()) .eq(Bookings::getRoomId,bookings.getRoomId()) ); -- Gitblit v1.9.3