From d70a64df5d6f7b3b8f68436bd92df8366219981b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 19:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 7dd7578..caddc95 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -96,6 +96,9 @@
             <if test="query.unitId != null">
                 AND wo.unit_id = #{query.unitId}
             </if>
+            <if test="query.unitId == null">
+                AND wo.unit_id is not null
+            </if>
             <if test="query.status != null and query.status != ''">
                 AND wo.status = #{query.status}
             </if>

--
Gitblit v1.8.0