|
|
@@ -970,8 +970,9 @@
|
|
|
and b.type= #{publicType}
|
|
|
</if>
|
|
|
<if test="assistType!=null">
|
|
|
- <foreach collection="assistType" item="type" >
|
|
|
- and find_in_set(#{type},pad.type) > 0
|
|
|
+ and
|
|
|
+ <foreach collection="assistType" item="type" separator=" or ">
|
|
|
+ find_in_set(#{type},pad.type) > 0
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="aid != null">
|
|
|
@@ -1324,8 +1325,9 @@
|
|
|
and a.type > 4
|
|
|
</if>
|
|
|
<if test="contentType!=null">
|
|
|
- <foreach item="item" collection="contentType" >
|
|
|
- and find_in_set(#{item},c.content_type) > 0
|
|
|
+ and
|
|
|
+ <foreach item="item" collection="contentType" separator=" or ">
|
|
|
+ find_in_set(#{item},c.content_type) > 0
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="aid !=null">
|
|
|
@@ -1338,8 +1340,9 @@
|
|
|
and b.uid = #{uid}
|
|
|
</if>
|
|
|
<if test="assistType !=null">
|
|
|
- <foreach item="item" collection="assistType" >
|
|
|
- and find_in_set(#{item},c.type) > 0
|
|
|
+ and
|
|
|
+ <foreach item="item" collection="assistType" separator=" or ">
|
|
|
+ find_in_set(#{item},c.type) > 0
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="startTime !=null and endTime !=null">
|