From 2117c8c5584451ecec7232db2f185c211a68acdf Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 26 八月 2024 15:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
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