From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/workreport/mapper/WorkReportMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/workreport/mapper/WorkReportMapper.xml b/src/main/java/org/springblade/modules/workreport/mapper/WorkReportMapper.xml
index a208717..94d8315 100644
--- a/src/main/java/org/springblade/modules/workreport/mapper/WorkReportMapper.xml
+++ b/src/main/java/org/springblade/modules/workreport/mapper/WorkReportMapper.xml
@@ -21,6 +21,9 @@
<if test="workReport.realName!=null and workReport.realName!=''">
and bu.real_name like concat('%', #{workReport.realName},'%')
</if>
+ <if test="workReport.content!=null and workReport.content!=''">
+ and swr.content like concat('%', #{workReport.content},'%')
+ </if>
<if test="workReport.type!=null">
and swr.type = #{workReport.type}
</if>
@@ -51,6 +54,9 @@
<if test="workReport.realName!=null and workReport.realName!=''">
and bu.real_name like concat('%', #{workReport.realName},'%')
</if>
+ <if test="workReport.content!=null and workReport.content!=''">
+ and swr.content like concat('%', #{workReport.content},'%')
+ </if>
<if test="workReport.type!=null">
and swr.type = #{workReport.type}
</if>
--
Gitblit v1.9.3