|
@@ -1372,7 +1372,12 @@ public class AuthServiceImpl implements AuthService {
|
|
if(StringUtils.isNotEmpty(startTIme)&&StringUtils.isNotEmpty(endTime)){
|
|
if(StringUtils.isNotEmpty(startTIme)&&StringUtils.isNotEmpty(endTime)){
|
|
listChallengeRoundVo=authMapper.getPublishedVideo(mobile,authParty,status,authUserId,startTIme,endTime);
|
|
listChallengeRoundVo=authMapper.getPublishedVideo(mobile,authParty,status,authUserId,startTIme,endTime);
|
|
}else{
|
|
}else{
|
|
- listChallengeRoundVo=authMapper.getPublishedVideo(mobile,authParty,status,authUserId,activityTime.getStartTime(),activityTime.getEndTime());
|
|
|
|
|
|
+ if(activityTime!=null){
|
|
|
|
+ listChallengeRoundVo=authMapper.getPublishedVideo(mobile,authParty,status,authUserId,activityTime.getStartTime(),activityTime.getEndTime());
|
|
|
|
+ }else{
|
|
|
|
+ listChallengeRoundVo=authMapper.getPublishedVideo(mobile,authParty,status,authUserId,null,null);
|
|
|
|
+
|
|
|
|
+ }
|
|
}
|
|
}
|
|
PageInfo<ChallengeRoundVo> pageData = new PageInfo<>(listChallengeRoundVo);
|
|
PageInfo<ChallengeRoundVo> pageData = new PageInfo<>(listChallengeRoundVo);
|
|
//调用抖音api获取视频数据
|
|
//调用抖音api获取视频数据
|
|
@@ -1439,7 +1444,11 @@ public class AuthServiceImpl implements AuthService {
|
|
if(StringUtils.isNotEmpty(startTIme)&&StringUtils.isNotEmpty(endTime)){
|
|
if(StringUtils.isNotEmpty(startTIme)&&StringUtils.isNotEmpty(endTime)){
|
|
publishedVideoListNoRanking = authMapper.getPublishedVideoNoRanking(mobile,authParty,status,authUserId,startTIme,endTime);
|
|
publishedVideoListNoRanking = authMapper.getPublishedVideoNoRanking(mobile,authParty,status,authUserId,startTIme,endTime);
|
|
}else{
|
|
}else{
|
|
- publishedVideoListNoRanking = authMapper.getPublishedVideoNoRanking(mobile,authParty,status,authUserId,activityTime.getStartTime(),activityTime.getEndTime());
|
|
|
|
|
|
+ if(activityTime!=null){
|
|
|
|
+ publishedVideoListNoRanking = authMapper.getPublishedVideoNoRanking(mobile,authParty,status,authUserId,activityTime.getStartTime(),activityTime.getEndTime());
|
|
|
|
+ }else{
|
|
|
|
+ publishedVideoListNoRanking = authMapper.getPublishedVideoNoRanking(mobile,authParty,status,authUserId,null,null);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
//获取不排名的数据
|
|
//获取不排名的数据
|
|
if(publishedVideoListNoRanking.size()>0&&listChallengeRoundVo.size()>0){
|
|
if(publishedVideoListNoRanking.size()>0&&listChallengeRoundVo.size()>0){
|