Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-08 4e52cb2253af9a22571c7d0c239ee283178d2fd4

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

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