From f547171a98907dbd9f824f145df4c902ff121683 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 20 九月 2024 10:13:49 +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 | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 44ca327..dd0a9bb 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
@@ -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) {
--
Gitblit v1.9.3