diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml index c0b0047..2161a21 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmWorkerAttMapper.xml @@ -118,15 +118,13 @@ LEFT JOIN bm_att_person bap ON bap.pro_id = pp.id AND pst.id = bap.team_id AND bap.att_day = #{startDate} WHERE pp.id = #{proId} - AND pp.is_active = 1 + AND pp.is_active = 1 and pst.id is not null AND ps.sub_name = #{subName} AND pst.team_name = #{teamName} - - GROUP BY pst.id diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml index 210313d..7055bb1 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml @@ -107,7 +107,7 @@