luoyb
2021-05-24 db6a13645ba212dee0ef46548cc3468d30b76873
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpDimissionAttendServiceImpl.java
@@ -70,7 +70,7 @@
            queryWrapper.like("a.CertificateNumb", empDimissionattend.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getDeptName())) {
            queryWrapper.like("a.DeptName", empDimissionattend.getDeptName());
            queryWrapper.like("b.allDeptName", empDimissionattend.getDeptName());
        }
        if (StringUtils.isNotBlank(empDimissionattend.getAttendYear())) {
            queryWrapper.like("a.AttendYear", empDimissionattend.getAttendYear());
@@ -86,7 +86,7 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpDimissionAttend> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "attendMonth", FebsConstant.ORDER_ASC, true);
        return empDimissionattendMapper.selectPageVo(page, queryWrapper);
    }
@@ -174,7 +174,7 @@
                returnList.add(StrUtil.format("导入离职当月考勤异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            dimissionAttend.setDelFlag(2);
            dimissionAttend.setDelFlag(0);
            dimissionAttend.setEmpId(empBaseInfo.getEmpId());
         dimissionAttend.setDeptName(list.get(1).toString());
         dimissionAttend.setDeptId(dept.getDeptId());