From 69f7797c85c830226eabee6d9793fed6ed6785a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 09 十二月 2024 16:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 12 +++++++++---
1 files changed, 9 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 6bc33be..ea320cd 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
@@ -142,6 +142,7 @@
bookings.setIsdeleted(MeetConstants.ZERO);
bookings.setStatus(MeetConstants.ZERO);
bookingsMapper.insert(bookings);
+ bookings.setManagerInfo(user.getRealname());
//鏇存柊浼氳瀹ら瀹氭椂闂存
updateBookingTimes(bookings, user);
//娣诲姞绠＄悊浜哄憳
@@ -153,7 +154,7 @@
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ SystemUser systemUser = systemUserMapper.selectById(user.getId());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
return bookings.getId();
@@ -1046,6 +1047,10 @@
bookings.setStatus(MeetConstants.ONE);
bookings.setEditDate(new Date());
bookings.setEditor(businessOverDTO.getUserId());
+ Rooms rooms = roomsMapper.selectById(bookings.getRoomId());
+ if(Objects.nonNull(rooms)){
+ bookings.setRoomName(rooms.getName());
+ }
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
@@ -1393,8 +1398,9 @@
.isNotNull(SystemUser::getOpenid)
);
List<String> openIdList = userRelList.stream().map(i->i.getOpenid()).collect(Collectors.toList());
- if(StringUtils.isNotBlank(openid)){
- openIdList.add(openid);
+ openIdList.add(openid);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(openIdList)){
+ return;
}
Set<String> openIds = new HashSet<String>(openIdList);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(openIds)){
--
Gitblit v1.9.3