Merge branch 'master' into docker_package
This commit is contained in:
commit
0259a0a1db
|
@ -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 != ''">
|
||||
|
|
Loading…
Reference in New Issue