fix(hr微服务): 修改bug

yz_08

2021-03-31 3917e97444aee0cafe7e93180edca156eaefb636

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

@@ -83,11 +83,9 @@
        }
        if (StringUtils.isNotBlank(empResign.getEmpStatus())) {
            queryWrapper.in("b.EmpStatus", empResign.getEmpStatus().split(","));
        } else {
            queryWrapper.in("b.EmpStatus", 0);
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "applayDate", FebsConstant.ORDER_ASC, true);
        return empResignMapper.selectPageVo(page, queryWrapper);
    }

@@ -170,13 +168,16 @@
   @Transactional(rollbackFor = Exception.class)
   public void importEmpResign(List<List<Object>> listObject,List<String>  returnList) {
      for (List<Object> list : listObject) {
            if (list.size()==0){
            if (list.size()==0||StrUtil.isBlank(list.get(0).toString())){
                continue;
            }
         EmpResign resign = new EmpResign();
         resign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
         resign.setEmpNumb(list.get(0).toString());
         List<Dept> depts = CastUtil.castList(redisService.get("depts"), Dept.class);
            if(null == depts){
                depts =remoteDeptService.setDeptRedis();
            }
            Dept dept = depts.stream().filter(d -> d.getDeptName().equals(list.get(1).toString())).findFirst().orElse(null);
            if (null == dept) {
                returnList.add(StrUtil.format("导入员工辞职申请异常: 出现位置第{}行, 原因:{}部门不存在",listObject.indexOf(list)+1,list.get(1).toString()));
@@ -187,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());