Merge branch 'hongdongbao'

src/main/java/com/cmeeting/service/impl/MeetingInfoServiceImpl.java

@@ -109,7 +109,6 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
                 .between(vo.getStartTime() != null, MeetingInfo::getStartTime, vo.getStartTime(), vo.getEndTime())
                 .select(MeetingInfo::getId, MeetingInfo::getMeetingId, MeetingInfo::getSubject, MeetingInfo::getHost, MeetingInfo::getHostUid,
                         MeetingInfo::getStartTime, MeetingInfo::getEndTime, MeetingInfo::getIsGenerated, MeetingInfo::getIsPushed);
-        // TODO查询部门
         Page<MeetingInfo> meetingInfoPage = mapper.selectPage(new Page<>(vo.getCurrent(), vo.getSize()), queryWrapper);
         if (CollUtil.isNotEmpty(meetingInfoPage.getRecords())) {
             List<MeetingInfo> records = meetingInfoPage.getRecords();

src/main/java/com/cmeeting/service/impl/ModulePermissionServiceImpl.java

@@ -61,7 +61,7 @@ public class ModulePermissionServiceImpl extends ServiceImpl<ModulePermissionMap
             // 授权了所有人
             boolean all = userIds.contains(CategoryConstant.ALL_EN) || deptIds.contains(CategoryConstant.ALL_EN);
             List<PermissionCheckedDTO.Category> categoryList = dto.getCategoryList();
-            if (CollUtil.isNotEmpty(deptIds) && CollUtil.isEmpty(categoryList)) {
+            if (CollUtil.isNotEmpty(deptIds) && CollUtil.isNotEmpty(categoryList)) {
                 for (PermissionCheckedDTO.Category category : categoryList) {
                     if (all || deptIds.contains(category.getId())) {
                         category.setCheck(true);
@@ -70,7 +70,7 @@ public class ModulePermissionServiceImpl extends ServiceImpl<ModulePermissionMap
             }
 
             List<PermissionCheckedDTO.User> userList = dto.getUserList();
-            if (CollUtil.isNotEmpty(userIds) && CollUtil.isEmpty(userList)) {
+            if (CollUtil.isNotEmpty(userIds) && CollUtil.isNotEmpty(userList)) {
                 for (PermissionCheckedDTO.User user : userList) {
                     if (all || userIds.contains(user.getId())) {
                         user.setCheck(true);

src/main/java/com/cmeeting/service/impl/TencentMeetingServiceImpl.java

@@ -274,8 +274,6 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,T
                                         ? weComUserMap.get(userDTO.getWid()).getEmailPushAccess() : Boolean.FALSE;
 
                                 // 查询会议开始和结束时间
-
-
                                 MeetingInfo startAndEndTimeByMeetingId = tencentMeetingApiUtil.getStartAndEndTimeByMeetingId(meetingId);
                                 //会议基本信息保存
                                 MeetingInfo meetingItem = MeetingInfo.builder().meetingId(meetingId).meetingCode(meeting.getMeetingCode())
@@ -288,7 +286,7 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,T
                                         .hostUid(hostId)
 //                                            .participantUsers(participants.stream()
 //                                                    .map(item->new String(Base64.getDecoder().decode(item.getUserName()))).distinct().collect(Collectors.joining("、")))
-                                        .recordFileId(recordFileIdList.stream().collect(Collectors.joining(",")))
+                                        .recordFileId(String.join(",", recordFileIdList))
                                         .email(email)
                                         .build();
                                 recordFileUrlList.add(recordFileItem);
@@ -309,7 +307,7 @@ public class TencentMeetingServiceImpl extends ServiceImpl<TecentMeetingMapper,T
                 for (Map.Entry<String, List<MeetingInfo>> entry : meetingSaveMap.entrySet()) {
                     MeetingInfo meetingInfo = entry.getValue().get(0);
                     List<String> recordFileIdList = entry.getValue().stream().flatMap(s -> Arrays.stream(s.getRecordFileId().split(","))).collect(Collectors.toList());
-                    meetingInfo.setRecordFileId(recordFileIdList.stream().collect(Collectors.joining(",")));
+                    meetingInfo.setRecordFileId(String.join(",", recordFileIdList));
                     finalSaveList.add(meetingInfo);
                     meetingFiles.add(TencentMeetingVO.RecordFile.builder()
                             .meetingId(meetingInfo.getMeetingId())