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