luoyb
2021-05-24 db6a13645ba212dee0ef46548cc3468d30b76873
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLeaveInfoServiceImpl.java
@@ -76,7 +76,7 @@
            queryWrapper.like("a.CertificateNumb", empLeaveinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empLeaveinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empLeaveinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empLeaveinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empLeaveinfo.getEmpStatus().split(","));
@@ -177,7 +177,7 @@
                returnList.add(StrUtil.format("导入员工请假记录异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            leaveInfo.setDelFlag(2);
            leaveInfo.setDelFlag(0);
            leaveInfo.setEmpId(empBaseInfo.getEmpId());
         leaveInfo.setDeptName(list.get(1).toString());
         leaveInfo.setDeptId(dept.getDeptId());