yijiusmile
2021-05-17 00c11e16ac27b31c8d29b3c64afa88082010c33e
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -73,7 +73,7 @@
            queryWrapper.like("a.CertificateNumb", empResign.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empResign.getDeptName())) {
            queryWrapper.like("a.DeptName", empResign.getDeptName());
            queryWrapper.like("b.allDeptName", empResign.getDeptName());
        }
        if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
           queryWrapper.between("a.ApplayDate", empResign.getApplayDateStr().split(",")[0],  empResign.getApplayDateStr().split(",")[1]);
@@ -188,7 +188,7 @@
                returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            resign.setDelFlag(2);
            resign.setDelFlag(0);
            resign.setEmpId(empId);
         resign.setDeptName(list.get(1).toString());
         resign.setDeptId(dept.getDeptId());