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/EmpRemarkInfoServiceImpl.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/EmpRemarkInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
index 715276c..dce0f6f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpRemarkInfoServiceImpl.java
@@ -60,6 +60,9 @@
queryWrapper.between(EmpRemarkInfo::getRemarkDate, empRemarkinfo.getRemarkDateStr().split(",")[0],
empRemarkinfo.getRemarkDateStr().split(",")[1]);
}
+ if (StringUtils.isNotBlank(empRemarkinfo.getRemarkContent())) {
+ queryWrapper.like(EmpRemarkInfo::getRemarkContent, empRemarkinfo.getRemarkContent());
+ }
Page<EmpRemarkInfo> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
--
Gitblit v1.8.0