From 6039b5f7fa82870ceb4c3173c8fa0721f5cee7bd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 22 七月 2024 10:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 478d8ff..e4cd9e1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -22,10 +22,10 @@
p.yw_person_name
FROM
t_work_order wo
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
- LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
where
- wo.deleted = '0'
+ wo.deleted = 0
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
@@ -48,10 +48,10 @@
p.yw_person_name
FROM
t_work_order wo
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = '0'
- LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = '0'
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
where
- wo.deleted = '0'
+ wo.deleted = 0
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
--
Gitblit v1.8.0