From 1e0fee57168f6190f5dc5a3e01f8cde2b5561811 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 19:50:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 4 ++++
1 files changed, 4 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 a487fd4..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>
@@ -258,6 +261,7 @@
<select id="getNotFinishedWorkOrders" resultMap="GenWorkOrderMap">
SELECT
+ DISTINCT
wo.id,
wo.serial_number,
wo.status,
--
Gitblit v1.8.0