luoyb
2021-05-25 61060637cf0c0910b20eaae6fc4992a723214e40
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpLaborTroubleServiceImpl.java
@@ -73,7 +73,7 @@
         queryWrapper.like("a.CertificateNumb", empLabortrouble.getCertificateNumb());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getDeptName())) {
         queryWrapper.like("a.DeptName", empLabortrouble.getDeptName());
         queryWrapper.like("b.allDeptName", empLabortrouble.getDeptName());
      }
      if (StringUtils.isNotBlank(empLabortrouble.getArbitrationDateStr())) {
         queryWrapper.between("a.ArbitrationDate", empLabortrouble.getArbitrationDateStr().split(",")[0],
@@ -97,7 +97,7 @@
      }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpLaborTrouble> page = new Page<>(request.getPageNum(), request.getPageSize());
        SortUtil.handlePageSort(request, page, "createTime", FebsConstant.ORDER_DESC, true);
        SortUtil.handlePageSort(request, page, "arbitrationDate", FebsConstant.ORDER_ASC, true);
        IPage<EmpLaborTrouble> iPage = empLabortroubleMapper.selectPageVo(page, queryWrapper);
        iPage.setRecords(this.convertDicItemName(iPage.getRecords()));
        return iPage;
@@ -202,7 +202,7 @@
            returnList.add(StrUtil.format("导入员工劳资案件异常: 出现位置第{}行, 原因:{}员工编号不存在",listObject.indexOf(list)+1,list.get(0).toString()));
            continue;
         }
         empLabortrouble.setDelFlag(2);
         empLabortrouble.setDelFlag(0);
         empLabortrouble.setEmpId(empBaseInfo.getEmpId());
         empLabortrouble.setDeptName(list.get(1).toString());
         empLabortrouble.setDeptId(dept.getDeptId());