Merge branch 'lybDevelop'

luoyb

2021-02-20 bedc1792239e77a46936bf9b175e324d57113bfe

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

@@ -60,6 +60,9 @@
        if (StringUtils.isNotBlank(empResign.getApplayDateStr())) {
           queryWrapper.between(EmpResign::getApplayDate, empResign.getApplayDateStr().split(",")[0],  empResign.getApplayDateStr().split(",")[1]);
        }
        if (StringUtils.isNotBlank(empResign.getReason())) {
            queryWrapper.like(EmpResign::getReason, empResign.getReason());
        }
        return this.page(page, queryWrapper);
    }