|
@@ -246,7 +246,7 @@
|
|
</if>
|
|
</if>
|
|
<if test='searchParams.leaveTypeSt!=null'>
|
|
<if test='searchParams.leaveTypeSt!=null'>
|
|
<![CDATA[
|
|
<![CDATA[
|
|
- and ( a.leave_type = '2' or a.leave_type = '5' or a.leave_type = '6')
|
|
|
|
|
|
+ and ((a.leave_type = '1' and CAST(a.days_ AS DECIMAL(10,6)) >= 4) or a.leave_type = '2' or a.leave_type = '5' or a.leave_type = '6')
|
|
]]>
|
|
]]>
|
|
</if>
|
|
</if>
|
|
<if test='searchParams.cancelStatus!=null'>
|
|
<if test='searchParams.cancelStatus!=null'>
|