From b16bb22a803b1ec2960822f08b30503a732ab3af Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 10:10:09 +0800
Subject: [PATCH] 通信中间件实现上行数据任务:恢复虚拟卡在取水口上占用状态为非占用状态

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
index be493a4..0f4282c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmCommandHistoryMapper.xml
@@ -255,6 +255,9 @@
       LEFT JOIN se_client cli ON cli.id = his.operator
       LEFT JOIN ba_user  user ON user.id = his.operator
     <where>
+      <if test="intakeId != null">
+        AND his.intake_id = #{intakeId}
+      </if>
       <if test = "commandName != null and commandName !=''">
         AND his.command_name LIKE CONCAT('%',#{commandName},'%')
       </if>
@@ -288,6 +291,9 @@
         LEFT JOIN se_client cli ON cli.id = his.operator
         LEFT JOIN ba_user  user ON user.id = his.operator
     <where>
+      <if test="intakeId != null">
+        AND his.intake_id = #{intakeId}
+      </if>
       <if test = "commandName != null and commandName !=''">
         AND his.command_name LIKE CONCAT('%',#{commandName},'%')
       </if>

--
Gitblit v1.8.0