产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
maven
8 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025 
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/MeetingServiceImpl.java


@@ -30,8 +30,8 @@


import com.ruoyi.project.system.domain.SysUser;


import com.ruoyi.project.system.mapper.SysUserMapper;


import com.ruoyi.project.system.service.ISysNoticeService;


import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;


import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;


import com.ruoyi.staff.mapper.StaffOnJobMapper;


import com.ruoyi.staff.pojo.StaffOnJob;


import lombok.RequiredArgsConstructor;


import org.springframework.stereotype.Service;




@@ -48,11 +48,12 @@


    private final MeetDraftMapper meetDraftMapper;




    private final MeetApplicationMapper meetApplicationMapper;


    private final StaffJoinLeaveRecordMapper staffJoinLeaveRecordMapper;


    private final StaffOnJobMapper staffOnJobMapper;




    private final MeetingMinutesMapper meetingMinutesMapper;


    private final SysUserMapper userMapper;


    private final ISysNoticeService sysNoticeService;






    @Override


    public IPage<MeetingRoom> getMeetingRoomList(SearchMeetingRoomVo vo) {


@@ -165,7 +166,7 @@


                    .filter(s -> !s.isEmpty())


                    .map(Long::valueOf)


                    .map(staffId -> {


                        StaffJoinLeaveRecord record = staffJoinLeaveRecordMapper.selectById(staffId);


                        StaffOnJob record = staffOnJobMapper.selectById(staffId);


                        if (record == null) {


                            return null;


                        }