@@ -1140,7 +1140,6 @@
from public_release
where status in(1,2) and aid = #{aid}
and release_start <= now()
- and release_end >= now()
order by release_start desc limit 10
</select>
<select id="selectOutListBoById" resultType="com.goafanti.weChat.bo.OutPublicReleaseList">
@@ -2976,7 +2976,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
}
//距离当前时间近的结束时间,不小于当前时间
- if (time2<count&&e.getReleaseEnd().getTime()>nowTime){
+ if (e.getType()==5||e.getType()==6){
+ if (time2<count){
+ count=time2;
+ id=e.getId();
+ }
+ }else if (time2<count&&e.getReleaseEnd().getTime()>nowTime){
if (e.getAlone()!=1 ){
count=time2;
id=e.getId();