luoyb
2021-05-25 61060637cf0c0910b20eaae6fc4992a723214e40
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -74,7 +74,7 @@
            queryWrapper.like("a.CertificateNumb", empContractinfo.getCertificateNumb());
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.like("a.DeptName", empContractinfo.getDeptName());
            queryWrapper.like("b.allDeptName", empContractinfo.getDeptName());
        }
        if (StringUtils.isNotBlank(empContractinfo.getSigningDateStr())) {
            queryWrapper.between("a.SigningDate", empContractinfo.getSigningDateStr().split(",")[0], empContractinfo.getSigningDateStr().split(",")[1]);
@@ -82,9 +82,9 @@
        if (StringUtils.isNotBlank(empContractinfo.getEndDateStr())) {
            queryWrapper.between("a.EndDate", empContractinfo.getEndDateStr().split(",")[0], empContractinfo.getEndDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
            queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        }
        // if (StringUtils.isNotBlank(empContractinfo.getDeptName())) {
        //     queryWrapper.in("a.deptName", empContractinfo.getDeptName());
        // }
        if (StringUtils.isNotBlank(empContractinfo.getContractStatus())) {
            queryWrapper.eq("a.ContractStatus", empContractinfo.getContractStatus());
        }