From 876ba23d1d80de11f5f619de4dd88b067c2251db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 23 Jul 2025 16:37:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-384=20=E7=94=A8=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=94=AF=E6=8C=81=E7=AE=A1=E7=90=86=E7=AB=AF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/TicketMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index 9c10ec0c..d2b2d7bb 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -155,7 +155,7 @@ LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN admin_user au ON t.user_id=au.id LEFT JOIN app_area a2 ON u.area_id=a2.id - LEFT JOIN device d ON t.device_no=d.device_no + LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1 LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type LEFT JOIN dictionary_item di ON d.warranty_state=di.id LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1 @@ -178,7 +178,7 @@ LEFT JOIN app_user u ON t.user_id=u.id LEFT JOIN admin_user au ON t.user_id=au.id LEFT JOIN app_area a2 ON u.area_id=a2.id - LEFT JOIN device d ON t.device_no=d.device_no + LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1 LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type LEFT JOIN dictionary_item di ON d.warranty_state=di.id LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1 @@ -202,7 +202,7 @@ LEFT JOIN admin_user au ON t.user_id=au.id LEFT JOIN app_area a2 ON u.area_id=a2.id INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1 - LEFT JOIN device d ON t.device_no=d.device_no + LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1 LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type LEFT JOIN dictionary_item di ON d.warranty_state=di.id LEFT JOIN admin_user auc ON t.cqm=auc.id @@ -224,7 +224,7 @@ LEFT JOIN admin_user au ON t.user_id=au.id LEFT JOIN app_area a2 ON u.area_id=a2.id INNER JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=1 - LEFT JOIN device d ON t.device_no=d.device_no + LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1 LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type LEFT JOIN dictionary_item di ON d.warranty_state=di.id LEFT JOIN admin_user auc ON t.cqm=auc.id @@ -260,7 +260,7 @@ AND tf.favorites_id=#{favouritesId} - LEFT JOIN device d ON t.device_no=d.device_no + LEFT JOIN device d ON t.device_no=d.device_no and d.data_valid_state=1 LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type LEFT JOIN dictionary_item di ON d.warranty_state=di.id LEFT JOIN admin_user auc ON t.cqm=auc.id