From 487bed3eba27a1f6621c43b7fab5c82468fa2bc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:26:44 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

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

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
index 2cdd204..bb25f7a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeWorkOrderMapper.xml
@@ -269,6 +269,14 @@
     <where>
       AND ord.deleted = 0
 
+      <if test = "dispatcherId != null">
+        AND ord.dispatcher_id = #{dispatcherId}
+      </if>
+
+      <if test = "inspectorId != null">
+        AND ord.inspector_id = #{inspectorId}
+      </if>
+
       <if test = "dispatcher != null and dispatcher !=''">
         AND us1.name like CONCAT('%',#{dispatcher},'%')
       </if>
@@ -317,6 +325,14 @@
     <where>
       AND ord.deleted = 0
 
+      <if test = "dispatcherId != null">
+        AND ord.dispatcher_id = #{dispatcherId}
+      </if>
+
+      <if test = "inspectorId != null">
+        AND ord.inspector_id = #{inspectorId}
+      </if>
+
       <if test = "dispatcher != null and dispatcher !=''">
         AND us1.name like CONCAT('%',#{dispatcher},'%')
       </if>

--
Gitblit v1.8.0