提交

孔祥富

2021-03-07 eb75ecc4eacb90f786ddf2e64c00547496345eeb

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

@@ -845,6 +845,12 @@
        } else {
            queryWrapper.in("a.EmpStatus", 0);
        }
        if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
            queryWrapper.in("a.empCardStatus", empBaseInfo.getEmpCardStatus().split(","));
        }
        if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
            queryWrapper.in("a.handBookStatus", empBaseInfo.getHandbookStatus().split(","));
        }
        // 下面的条件就是人员的属性条件，条件之间是或的关系
        if (this.checkQueryCondition(empBaseInfo)) {
            queryWrapper.and(p -> {
@@ -852,13 +858,13 @@
                    p.like("a.EmpNumb", empBaseInfo.getEmpNumb());
                }
                if (StringUtils.isNotBlank(empBaseInfo.getEmpName())) {
                    p.like("a.EmpName", empBaseInfo.getEmpName());
                    p.or().like("a.EmpName", empBaseInfo.getEmpName());
                }
                if (StringUtils.isNotBlank(empBaseInfo.getDeptName())) {
                    p.like("a.DeptName", empBaseInfo.getDeptName());
                    p.or().like("a.DeptName", empBaseInfo.getDeptName());
                }
                if (StringUtils.isNotBlank(empBaseInfo.getCertificateNumb())) {
                    p.like("a.CertificateNumb", empBaseInfo.getCertificateNumb());
                    p.or().like("a.CertificateNumb", empBaseInfo.getCertificateNumb());
                }
                if (StringUtils.isNotBlank(empBaseInfo.getEntryDateStr())) {
                    p.between("a.EntryDate", empBaseInfo.getEntryDateStr().split(",")[0], empBaseInfo.getEntryDateStr().split(",")[1]);