Merge branch 'lybfix20210302'

luoyb

2021-03-02 f961867e0e1ca3251928b1134eb66549a6a89ee3

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

@@ -853,6 +853,12 @@
                if (StringUtils.isNotBlank(empBaseInfo.getInsuranceType())) {
                    p.or().in(EmpBaseInfo::getInsuranceType, empBaseInfo.getInsuranceType().split(","));
                }
                if (StringUtils.isNotBlank(empBaseInfo.getHandbookStatus())) {
                    p.or().in(EmpBaseInfo::getHandbookStatus, empBaseInfo.getHandbookStatus().split(","));
                }
                if (StringUtils.isNotBlank(empBaseInfo.getEmpCardStatus())) {
                    p.or().in(EmpBaseInfo::getEmpCardStatus, empBaseInfo.getEmpCardStatus().split(","));
                }
            });
        }
        return queryWrapper;