|
|
@@ -414,11 +414,14 @@
|
|
|
left join customer_organization_info d on a.id = d.cid
|
|
|
left join admin e on a.aid = e.id
|
|
|
where a.effective = 0
|
|
|
- <if test="aid != null and aid != ''">
|
|
|
- and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
+ <if test="aid != null and aid != ''">
|
|
|
+ and (a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="paid != null and paid != ''">
|
|
|
- or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%')
|
|
|
+ or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%'))
|
|
|
+ </if>
|
|
|
+ <if test="paid == null or paid == ''">
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="shareType != null">
|
|
|
and a.share_type = #{shareType,jdbcType=INTEGER}
|
|
|
@@ -465,10 +468,13 @@
|
|
|
left join admin e on a.aid = e.id
|
|
|
where a.effective = 0
|
|
|
<if test="aid != null and aid != ''">
|
|
|
- and a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
+ and (a.aid = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="paid != null and paid != ''">
|
|
|
- or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%')
|
|
|
+ or a.paid like concat('%',#{paid,jdbcType=VARCHAR},'%'))
|
|
|
+ </if>
|
|
|
+ <if test="paid == null or paid == ''">
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="shareType != null">
|
|
|
and a.share_type = #{shareType,jdbcType=INTEGER}
|