From a28aab6e2006e56da48076c2447bce2676f888ea Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 03 六月 2024 16:23:22 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 4 +--- 1 files changed, 1 insertions(+), 3 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 5c94572..08a1744 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 @@ -125,7 +125,6 @@ @Transactional(rollbackFor = {BusinessException.class, Exception.class}) public Integer create(Bookings bookings) { LoginUserInfo user = bookings.getLoginUserInfo(); - user.setId(bookings.getCreator()); isCreateParamValid(bookings, user); bookings.setCreateDate(new Date()); bookings.setCreator(user.getId()); @@ -201,7 +200,6 @@ for (int i = 0; i < bookings.getBookingTimeList().size(); i++) { BookingTime s = bookings.getBookingTimeList().get(i); if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) { - List<Bookings> detailDataDtoStream = bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId()) ).collect(Collectors.toList()); @@ -1145,7 +1143,7 @@ page.getRecords().forEach(j->{ j.setPrefixUrl(path); if(bookingsMapper.selectCount(new QueryWrapper<Bookings>() - .exists(" select 1 from meeting_user_rel u where u.OBJ_ID = bookings.id and u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1 ") + .exists(" select 1 from meeting_user_rel u where u.OBJ_ID = meeting_book.id and u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1 ") .and(i -> i.between("START_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00") .or().between("END_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00") ) -- Gitblit v1.9.3