|
@@ -68,9 +68,12 @@
|
68
|
68
|
<if test=" bo.companyName != null and bo.companyName != ''">
|
69
|
69
|
AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
|
70
|
70
|
</if>
|
71
|
|
- <if test=" bo.settlement != null and bo.settlement != ''">
|
|
71
|
+ <if test=" bo.settlement != null and bo.settlement ">
|
72
|
72
|
AND t.settlement = #{bo.settlement}
|
73
|
73
|
</if>
|
|
74
|
+ <if test=" bo.settlement != null and bo.settlement == false ">
|
|
75
|
+ AND (t.settlement = #{bo.settlement} or t.settlement is null)
|
|
76
|
+ </if>
|
74
|
77
|
<if test=" bo.companyCode != null and bo.companyCode != ''">
|
75
|
78
|
AND t2.company_code like CONCAT('%',#{bo.companyCode} , '%')
|
76
|
79
|
</if>
|