From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 09:48:53 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
index 1877141..732099c 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -31,7 +31,7 @@
FROM
t_report r
LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
- LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
+ LEFT JOIN t_yw_people p ON r.people_id = p.user_id and p.deleted = 0
LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
INNER JOIN t_report_error_type ret ON ret.report_id = r.id and ret.deleted = 0 <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
AND ret.error_type in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>
--
Gitblit v1.8.0