Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-29 11:15:28 +08:00
commit 0259a0a1db
1 changed files with 1 additions and 1 deletions

View File

@ -1724,7 +1724,7 @@
AND taa.approve_status != '不通过'
</otherwise>
</choose>
<if test="deptId != null and approveStatus != ''">
<if test="deptId != null and deptId != ''">
AND sd.id = #{deptId}
</if>
<if test="startDate != null and startDate != '' and endDate != null and endDate != ''">