From a1cd5dff6ab9be0558ce17554569610cc0c3ae9d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 30 四月 2024 16:58:08 +0800
Subject: [PATCH] bug修改
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 8 ++++----
ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
index e44019b..e4f1a73 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/WorkOrderMapper.java
@@ -20,7 +20,7 @@
@Mapper
public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
- void page(IPage page, @Param("query") WorkOrderQuery query);
+ IPage page(IPage page, @Param("query") WorkOrderQuery query);
List<WorkOrderVO> distributePage(@Param("query") DistributeWorkOrderQuery query);
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 0c5ab30..364b380 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -17,11 +17,11 @@
<select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
- wo.*,
- u.unit_name,
- p.yw_person_name
+ wo.*,
+ u.unit_name,
+ p.yw_person_name
FROM
- t_work_order wo
+ 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'
where
--
Gitblit v1.8.0