From bedc1792239e77a46936bf9b175e324d57113bfe Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 20 二月 2021 06:13:50 +0800
Subject: [PATCH] Merge branch 'lybDevelop'

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index c22ceae..c50839a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/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);
     }
 

--
Gitblit v1.8.0