From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
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