yz_08
2021-05-13 28187d584b00856bb1961b7ce6ebd168ef1aded7
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],
@@ -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());