From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index ed1861a..850ac2e 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -95,7 +95,7 @@
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
- INNER JOIN t_yw_unit yu ON yu.id = yp.unit_id
+ LEFT JOIN t_yw_unit yu ON yu.id = yp.unit_id
<where>
<if test="query.pointName != null and query.pointName != ''">
AND m.name like concat('%', #{query.pointName} ,'%')
--
Gitblit v1.8.0