Merge remote-tracking branch 'origin/master'

jiangping

2024-09-20 af1603e4e4f5505a1fd5526134bbd43dc66d5281

 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java

@@ -863,7 +863,7 @@
            if(Objects.isNull(bookings)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY);
            }
            return getMeetingDetail(bookings.getId());
            return getMeetingDetail(bookings.getId(),null);
        }catch (Exception e){
            e.printStackTrace();
        }
@@ -880,7 +880,7 @@
     * @return
     */
    @Override
    public MeetingDetailResponse getMeetingDetail(Integer id) {
    public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
        MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
        if (Objects.isNull(meetingDetailResponse)) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "未查询到会议详情");
@@ -925,9 +925,18 @@
                .eq("OBJ_ID", meetingDetailResponse.getRoomId())
                .eq("OBJ_TYPE",MeetConstants.ZERO)
        );
        if(Constants.equalsInteger(sysUserId,meetingDetailResponse.getBookingUserId())){
            meetingDetailResponse.setIsAdmin(Constants.ONE);
        }
        if (!Objects.isNull(userRelList) && userRelList.size() > 0) {
            meetingDetailResponse.setRoomUser(systemUserService.findById(userRelList.get(MeetConstants.ZERO).getUserId()));
            if( Objects.nonNull(sysUserId) &&
                    userRelList.stream().filter(i->Constants.equalsInteger(i.getUserId(),sysUserId)).collect(Collectors.toList()).size()>Constants.ZERO
            ){
                meetingDetailResponse.setIsAdmin(Constants.ONE);
            }
        }

        return meetingDetailResponse;
    }

@@ -1022,7 +1031,7 @@
        Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
                .eq(UserRel::getIsdeleted,Constants.ZERO)
                .eq(UserRel::getObjId,bookings.getRoomId())
                .eq(UserRel::getObjType,Constants.ONE)
                .eq(UserRel::getObjType,Constants.ZERO)
                .eq(UserRel::getUserId,businessOverDTO.getUserId()));

        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
@@ -1093,7 +1102,7 @@
        Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
                .eq(UserRel::getIsdeleted,Constants.ZERO)
                .eq(UserRel::getObjId,bookings.getRoomId())
                .eq(UserRel::getObjType,Constants.ONE)
                .eq(UserRel::getObjType,Constants.ZERO)
                .eq(UserRel::getUserId,businessOverDTO.getUserId()));

        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {