bonus
/
sh_real_name_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
马三炮 2025-11-18 18:12:38 +08:00
parent d35162de7b 2502d864ef
commit 73d8f38209
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/AppRecognitionMapper.xml
View File

@ -47,6 +47,9 @@
LEFT JOIN bm_worker_contract bwc ON bwc.worker_id = bwem.worker_id LEFT JOIN bm_worker_contract bwc ON bwc.worker_id = bwem.worker_id
AND bwc.is_active = 1 AND bwc.is_active = 1
WHERE WHERE
pw.id_number = #{idNumber} AND bwem.pro_id = #{proId} pw.id_number = #{idNumber}
<if test="proId != null">
AND bwem.pro_id = #{proId}
</if>
</select> </select>
</mapper> </mapper>

2
bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/HomePageSubMapper.xml
View File

@ -209,7 +209,7 @@
LEFT JOIN pm_sub_company psc ON pp.sub_com_id = psc.id 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 LEFT JOIN bm_worker_ein_msg bwem ON pp.id = bwem.pro_id AND bwem.team_id = pst.id
AND bwem.is_active = 1 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.is_active = 1
AND bap.att_day = #{currentDay} AND bap.att_day = #{currentDay}
WHERE WHERE