From f0f08cc1ff84d45de32d8bff4a40e6a7d0d7a9e6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 12 三月 2025 10:45:59 +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 | 9 ++++++---
1 files changed, 6 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 f353d3f..1ef9156 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
@@ -649,7 +649,7 @@
//鏌ヨ鏄惁鏈夋潈闄�
s.setHasRole(getHasRoleByParam(s,userInfo,adminList));
- /* //鏈嶅姟椤�
+ /* //鏈嶅姟椤�
MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>();
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
@@ -1091,7 +1091,8 @@
@Override
public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
- if (Objects.isNull(meetingDetailResponse)) {
+ if (Objects.isNull(meetingDetailResponse)
+ || Constants.equalsInteger(meetingDetailResponse.getIsdeleted(),Constants.ONE) ) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌浼氳璇︽儏");
}
//棰勭害浜�
@@ -1184,6 +1185,7 @@
public Integer reservationMeeting(BookingsRequest bookingsRequest) {
Bookings bookings = new Bookings();
BeanUtils.copyProperties(bookingsRequest, bookings);
+ bookings.setJoinNotice(bookingsRequest.getJoinNotice());
if (Objects.isNull(bookingsRequest.getId())) {
this.create(bookings);
return bookings.getId();
@@ -1579,7 +1581,7 @@
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))
- .replace("{浼氳澶囨敞}",StringUtils.defaultString(smsEmail.getRemark(),"")));
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"")));
smsEmailList.add(smsEmail);
}
}
@@ -1605,6 +1607,7 @@
.replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),""))
.replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
.replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
+ .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),""))
.replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
smsEmailList.add(smsEmail);
}
--
Gitblit v1.9.3