修复导入空行的问题

yijiusmile

2021-04-20 096f6025e0212b23df8485b56818c3f0b019aa26

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpJobChangeServiceImpl.java

@@ -1,6 +1,13 @@
package cc.mrbird.febs.server.hr.service.impl;

import cc.mrbird.febs.common.core.constant.DicCode;
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.constant.FebsConstant;
import cc.mrbird.febs.common.core.entity.system.DicItem;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.SortUtil;
import cc.mrbird.febs.common.redis.service.RedisService;
import cc.mrbird.febs.server.hr.entity.EmpBaseInfo;
import cc.mrbird.febs.server.hr.entity.EmpJobChange;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpJobChangeMapper;
@@ -39,6 +46,7 @@

    private final EmpJobChangeMapper empJobchangeMapper;
    private final IRemoteDeptService remoteDeptService;
    private final RedisService redisService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");
@@ -67,12 +75,24 @@
        }
        if (StringUtils.isNotBlank(empJobchange.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empJobchange.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        Page<EmpJobChange> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "changeDate", FebsConstant.ORDER_ASC, true);
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return this.baseMapper.selectPageVo(page, queryWrapper);
         IPage<Map<String,Object>> iPage = this.baseMapper.selectPageVo(page, queryWrapper);
        List<Map<String,Object>> list =iPage.getRecords();
        List<DicItem> dicItems = CastUtil.castList(redisService.get("dicItems"), DicItem.class);
        list.forEach(p->{
            String jobChangeTypeName = dicItems.stream()
                    .filter(k -> DicCode.JOB_CHANGE_TYPE.equals(k.getDicCode()) && k.getDicItemCode().equals(p.get("changeType")))
                    .findFirst()
                    .map(DicItem::getDicItemName)
                    .orElse("未知");
            p.put("changeTypeName", jobChangeTypeName);
        });
        iPage.setRecords(list);
        return iPage;

    }

    @Override