From f58bc2bd531bf500834509d29a512f95fa32445e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 25 Jun 2025 13:49:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-369=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DeviceMapper.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml index 0768dada..ccadb296 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml @@ -72,10 +72,13 @@ INNER JOIN dictionary_item di ON di.id=d.device_state LEFT JOIN dictionary_item di2 ON di2.id=d.warranty_state LEFT JOIN dictionary_item_translate dit2 ON dit2.dictionary_item_id=d.warranty_state AND dit2.language_code=#{language} - WHERE d.data_valid_state=1 AND di.`code`='Normal' AND c.id IN - - #{companyId} - + WHERE d.data_valid_state=1 AND di.`code`='Normal' + + AND c.id IN + + #{companyId} + + AND d.production_line_id in