|
|
@@ -1298,7 +1298,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findAssistList" resultType="com.goafanti.weChat.bo.OutListAssist">
|
|
|
- select a.id ,if(a.`type` < 5,0,1) type,c.type assistType,
|
|
|
+ select a.id ,a.`type`,c.type assistType,
|
|
|
c.content_type contentType,c.content ,a.aname,a.assist_aid_name assistAidName,
|
|
|
a.user_names userNames ,d.sign_number signNumber ,d.public_count publicCount,d.assist_count assistCount ,
|
|
|
d.public_assist_count publicAssistCount ,d.non_public_count nonPublicCount,a.release_start releaseStart,
|
|
|
@@ -1314,10 +1314,10 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
<sql id="findAssistListSql">
|
|
|
- <if test="assistType==0">
|
|
|
+ <if test="type==0">
|
|
|
and a.type < 5
|
|
|
</if>
|
|
|
- <if test="assistType==1">
|
|
|
+ <if test="type==1">
|
|
|
and a.type > 4
|
|
|
</if>
|
|
|
<if test="contentType!=null">
|
|
|
@@ -1332,10 +1332,10 @@
|
|
|
<if test="uid !=null">
|
|
|
and b.uid = #{uid}
|
|
|
</if>
|
|
|
- <if test="projectType !=null">
|
|
|
+ <if test="assistType !=null">
|
|
|
and a.id in (select DISTINCT prid from public_release_type
|
|
|
where `type` in
|
|
|
- <foreach item="item" collection="projectType" separator="," open="(" close=")">
|
|
|
+ <foreach item="item" collection="assistType" separator="," open="(" close=")">
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|