会议bug修改

src/main/java/com/xjrsoft/module/oa/service/impl/WfMeetingApplyServiceImpl.java

@@ -205,6 +205,8 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
                 .le(ObjectUtils.isNotEmpty(dto.getEndMeetingApplyDate()), WfMeetingApply::getMeetingApplyDate, dto.getEndMeetingApplyDate())
                 .eq(StringUtils.isNotEmpty(dto.getMeetingApplyFormat()), WfMeetingApply::getMeetingApplyFormat, dto.getMeetingApplyFormat())
                 .like(StringUtils.isNotEmpty(dto.getMeetingApplyTheme()), WfMeetingApply::getMeetingApplyTheme, dto.getMeetingApplyTheme())
+                .orderByDesc(WfMeetingApply::getMeetingApplyDate)
+                .orderByAsc(WfMeetingApply::getMeetingApplyS)
         ;
         if (ObjectUtils.isNotEmpty(dto.getMeetingStatus()) && dto.getMeetingStatus() == 0) {
             wfMeetingApplyPageVoMPJLambdaWrapper
@@ -467,14 +469,16 @@ public class WfMeetingApplyServiceImpl extends MPJBaseServiceImpl<WfMeetingApply
             List<File> fileList = fileMapper.selectList(Wrappers.<File>query().lambda().eq(File::getFolderId, info.getPreMeetingInfoFileId()));
             info.setFileInfos(fileList);
 
-            // 处理签到状态
+            // 如果是会议参会人员，应该处理签到状态
             LambdaQueryWrapper<MeetingConferee> meetingConfereeLambdaQueryWrapper = new LambdaQueryWrapper<>();
             meetingConfereeLambdaQueryWrapper
                     .eq(MeetingConferee::getUserId, StpUtil.getLoginIdAsLong())
                     .eq(MeetingConferee::getWfMeetingApplyId, id)
                     ;
             MeetingConferee meetingConferee = meetingConfereeMapper.selectOne(meetingConfereeLambdaQueryWrapper);
-            info.setCheckInStatus(meetingConferee.getCheckInStatus());
+            if(ObjectUtils.isNotEmpty(meetingConferee)){
+                info.setCheckInStatus(meetingConferee.getCheckInStatus());
+            }
 
             // 处理状态
             LocalTime nowLocalTime = LocalTime.now();