luoyb
2021-05-24 db6a13645ba212dee0ef46548cc3468d30b76873
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBadRecordServiceImpl.java
@@ -71,7 +71,7 @@
         queryWrapper.like("a.CertificateNumb", empBadrecord.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empBadrecord.getDeptName())) {
         queryWrapper.like("a.DeptName", empBadrecord.getDeptName());
         queryWrapper.like("b.allDeptName", empBadrecord.getDeptName());
      }
      if (StringUtils.isNotBlank(empBadrecord.getBadDateStr())) {
         queryWrapper.between("a.badDate", empBadrecord.getBadDateStr().split(",")[0],empBadrecord.getBadDateStr().split(",")[1]);
@@ -84,7 +84,7 @@
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpBadRecord> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "badDate", FebsConstant.ORDER_ASC, true);
        return empBadrecordMapper.selectPageVo(page, queryWrapper);
    }
@@ -187,7 +187,7 @@
                returnList.add(StrUtil.format("导入员工不良记录信息异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
                continue;
            }
            empBadrecord.setDelFlag(2);
            empBadrecord.setDelFlag(0);
            empBadrecord.setEmpId(empId);
         empBadrecord.setDeptName(list.get(1).toString());
         empBadrecord.setDeptId(dept.getDeptId());