|
@@ -2444,8 +2444,11 @@ inner join(
|
|
|
where aid= #{aid} and status =2
|
|
where aid= #{aid} and status =2
|
|
|
group by b.uid )t0 on a.id=t0.uid
|
|
group by b.uid )t0 on a.id=t0.uid
|
|
|
</if>
|
|
</if>
|
|
|
- where a.`type` =1 and a.status =0 and a.share_type in (0,1,4)
|
|
|
|
|
|
|
+ where a.`type` =1 and a.status =0
|
|
|
and a.aid = #{aid}
|
|
and a.aid = #{aid}
|
|
|
|
|
+ <if test="type==0">
|
|
|
|
|
+ and a.share_type in (0,2,4)
|
|
|
|
|
+ </if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
and a.nickname like concat('%',#{name},'%')
|
|
and a.nickname like concat('%',#{name},'%')
|
|
|
</if>
|
|
</if>
|
|
@@ -2468,8 +2471,11 @@ inner join(
|
|
|
where aid= #{aid} and status =2
|
|
where aid= #{aid} and status =2
|
|
|
group by b.uid )t0 on a.id=t0.uid
|
|
group by b.uid )t0 on a.id=t0.uid
|
|
|
</if>
|
|
</if>
|
|
|
- where a.`type` =1 and a.status =0 and a.share_type in (0,1,4)
|
|
|
|
|
|
|
+ where a.`type` =1 and a.status =0
|
|
|
and a.aid = #{aid}
|
|
and a.aid = #{aid}
|
|
|
|
|
+ <if test="type==0">
|
|
|
|
|
+ and a.share_type in (0,2,4)
|
|
|
|
|
+ </if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
and a.nickname like concat('%',#{name},'%')
|
|
and a.nickname like concat('%',#{name},'%')
|
|
|
</if>
|
|
</if>
|