From c377b6abc119bd6acf4ea3a95a6a309caa28c46b Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 06 十二月 2024 14:54:33 +0800
Subject: [PATCH] 优化代码 获取工单详情接口  修改处理结果状态         获取工单列表接口  修改处理结果状态

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 884118b..53147f1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -390,10 +390,10 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
-      <if test="intakeId != null">
-        and rasl.intake_id = #{intakeId}
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeName != null">
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
@@ -474,10 +474,10 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
-      <if test="intakeId != null">
-        and rasl.intake_id = #{intakeId}
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
       </if>
-      <if test="intakeName != null">
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">

--
Gitblit v1.8.0