xx

孔祥富

2021-03-09 c3a6b64f474a112b55b0693126721f295d1d1279

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

@@ -81,11 +81,14 @@
            queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like("a.EmpStatus", empContractinfo.getEmpStatus());
            queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
        }
        if (StringUtils.isNotBlank(empContractinfo.getEmpStatus())) {
            queryWrapper.in("a.EmpStatus", empContractinfo.getEmpStatus().split(","));
        }
        queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
        Page<EmpContractInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<EmpContractInfo> iPage = empContractinfoMapper.selectPageVo(page, queryWrapper);