From 2502d864ef38a5b06117e011cd5be1bee1b8dd33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Tue, 18 Nov 2025 18:01:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=BA=E5=91=98=E7=BA=A2=E7=BB=BF=E7=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/bmw/AppRecognitionMapper.xml | 5 ++++- .../src/main/resources/mapper/bmw/HomePageSubMapper.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/AppRecognitionMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/AppRecognitionMapper.xml index ab711ac..9385a50 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/AppRecognitionMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/AppRecognitionMapper.xml @@ -47,6 +47,9 @@ LEFT JOIN bm_worker_contract bwc ON bwc.worker_id = bwem.worker_id AND bwc.is_active = 1 WHERE - pw.id_number = #{idNumber} AND bwem.pro_id = #{proId} + pw.id_number = #{idNumber} + + AND bwem.pro_id = #{proId} + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml index 582348a..c618d21 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml @@ -209,7 +209,7 @@ LEFT JOIN pm_sub_company psc ON pp.sub_com_id = psc.id LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id AND bwem.team_id = pst.id AND bwem.is_active = 1 - LEFT JOIN bm_att_person bap ON pp.id = bap.pro_id + LEFT JOIN bm_att_person bap ON pp.id = bap.pro_id AND bap.team_id = pst.id AND bap.is_active = 1 AND bap.att_day = #{currentDay} WHERE