Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-09 6cda44af74fe63b2e276af3228c7bca00dec7ffa

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

@@ -92,7 +92,7 @@
         queryWrapper.eq("a.SettleStatus", empAccidentcases.getSettleStatus());
      }
      if (StringUtils.isNotBlank(empAccidentcases.getEmpStatus())) {
         queryWrapper.eq("a.EmpStatus", empAccidentcases.getEmpStatus());
         queryWrapper.in("a.EmpStatus", empAccidentcases.getEmpStatus().split(","));
      }
      queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
      Page<EmpAccidentCases> page = new Page<>(request.getPageNum(), request.getPageSize());