fix(工作简历录入): 保存时部门id和岗位id保存不正确

luoyb

2021-03-05 4af0750c19cf7d968c159e0634c88d35e09d83f7

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

@@ -7,6 +7,7 @@
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
import cc.mrbird.febs.server.hr.feign.IRemoteDeptService;
import cc.mrbird.febs.server.hr.mapper.EmpResignMapper;
import cc.mrbird.febs.server.hr.service.IEmpBaseInfoService;
import cc.mrbird.febs.server.hr.service.IEmpResignService;
@@ -19,10 +20,12 @@
import org.springframework.transaction.annotation.Propagation;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.common.core.utils.CastUtil;
import cc.mrbird.febs.common.core.utils.FebsUtil;
@@ -48,34 +51,36 @@
   private final RedisService redisService;
    private final EmpResignMapper empResignMapper;
    private final IEmpBaseInfoService empBaseInfoService;
    private final IRemoteDeptService remoteDeptService;
    private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
            .map(u -> u.getUserId().toString())
            .orElse("1");

    @Override
    public IPage<EmpResign> findEmpResigns(QueryRequest request, EmpResign empResign) {
        LambdaQueryWrapper<EmpResign> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EmpResign::getDelFlag, empResign.getDelFlag());
       QueryWrapper<EmpResign> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("a.DelFlag", empResign.getDelFlag());
        Page<EmpResign> page = new Page<>(request.getPageNum(), request.getPageSize());
        if (StringUtils.isNotBlank(empResign.getEmpNumb())) {
            queryWrapper.like(EmpResign::getEmpNumb, empResign.getEmpNumb());
            queryWrapper.like("a.EmpNumb", empResign.getEmpNumb());
        }
        if (StringUtils.isNotBlank(empResign.getEmpName())) {
            queryWrapper.like(EmpResign::getEmpName, empResign.getEmpName());
            queryWrapper.like("a.EmpName", empResign.getEmpName());
        }
        if (StringUtils.isNotBlank(empResign.getCertificateNumb())) {
            queryWrapper.like(EmpResign::getCertificateNumb, empResign.getCertificateNumb());
            queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empResign.getDeptName())) {
            queryWrapper.like(EmpResign::getDeptName, empResign.getDeptName());
            queryWrapper.like("a.DeptName", empResign.getDeptName());
        }
        if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
           queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0],  empResign.getApplayDateStr().split(",")[1]);
           queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0],  empResign.getApplayDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empResign.getReason())) {
            queryWrapper.like(EmpResign::getReason, empResign.getReason());
            queryWrapper.like("a.Reason", empResign.getReason());
        }
        return this.page(page, queryWrapper);
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        return empResignMapper.selectPageVo(page, queryWrapper);
    }

    @Override