From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml b/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
index 38ee2c1..a955914 100644
--- a/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
+++ b/src/main/java/org/springblade/modules/directive/mapper/DirectiveMapper.xml
@@ -16,13 +16,19 @@
where
1=1
<if test="directive.type!=null and directive.type!=''">
- and sll.type = #{directive.type}
+ and sd.type = #{directive.type}
</if>
<if test="directive.startTime!=null and directive.startTime!=''">
- and sl.send_time >= #{directive.startTime}
+ and sd.send_time >= #{directive.startTime}
</if>
<if test="directive.endTime!=null and directive.endTime!=''">
- and sl.send_time <= #{directive.endTime}
+ and sd.send_time <= #{directive.endTime}
+ </if>
+ <if test="directive.sendDirectiveId!=null and directive.sendDirectiveId!=''">
+ and sd.send_directive_id like concat('%', #{directive.sendDirectiveId},'%')
+ </if>
+ <if test="directive.receiveDirectiveIds!=null and directive.receiveDirectiveIds!=''">
+ and sd.receive_directive_ids like concat('%', #{directive.receiveDirectiveIds},'%')
</if>
</select>
--
Gitblit v1.9.3