liu
10 天以前 dd1a51612fcd3c839d31dfa0df83b3d3071c8145
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -62,7 +62,16 @@
    @Override
    public IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
        LambdaQueryWrapper<InspectionTask> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.orderByDesc(InspectionTask::getCreateTime);
        queryWrapper.and(w -> w.isNull(InspectionTask::getDeleted).or().eq(InspectionTask::getDeleted, 0))
                .like(StringUtils.isNotBlank(inspectionTaskDto.getTaskName()),
                        InspectionTask::getTaskName, inspectionTaskDto.getTaskName())
                .like(StringUtils.isNotBlank(inspectionTaskDto.getInspectionLocation()),
                        InspectionTask::getInspectionLocation, inspectionTaskDto.getInspectionLocation())
                .eq(StringUtils.isNotBlank(inspectionTaskDto.getTaskStatus()),
                        InspectionTask::getTaskStatus, inspectionTaskDto.getTaskStatus())
                .eq(StringUtils.isNotBlank(inspectionTaskDto.getDeviceSource()),
                        InspectionTask::getDeviceSource, inspectionTaskDto.getDeviceSource())
                .orderByDesc(InspectionTask::getCreateTime);
        IPage<InspectionTask> entityPage = inspectionTaskMapper.selectPage(page, queryWrapper);
        //  无数据提前返回
@@ -72,7 +81,11 @@
        // 获取id集合
        List<Long> ids = entityPage.getRecords().stream().map(InspectionTask::getId).collect(Collectors.toList());
        //登记人ids
        List<Long> registrantIds = entityPage.getRecords().stream().map(InspectionTask::getRegistrantId).collect(Collectors.toList());
        List<Long> registrantIds = entityPage.getRecords().stream()
                .map(InspectionTask::getRegistrantId)
                .filter(Objects::nonNull)
                .distinct()
                .collect(Collectors.toList());
        // 批量查询登记人
        Map<Long, SysUser> sysUserMap;
        if (!registrantIds.isEmpty()) {