|
|
@ -239,7 +239,11 @@ |
|
|
or actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId} |
|
|
or actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId} |
|
|
</if> |
|
|
</if> |
|
|
<if test='actType != null and actType != "" and actType != "5"'> |
|
|
<if test='actType != null and actType != "" and actType != "5"'> |
|
|
AND relation.STATUS = #{actType} |
|
|
AND (relation.STATUS = #{actType} |
|
|
|
|
|
<if test='actType == "1"'> |
|
|
|
|
|
OR relation.STATUS = '2' |
|
|
|
|
|
</if> |
|
|
|
|
|
) |
|
|
and actInfo.ACT_STATUS = '1' |
|
|
and actInfo.ACT_STATUS = '1' |
|
|
</if> |
|
|
</if> |
|
|
ORDER BY |
|
|
ORDER BY |
|
|
|