Merge branch 'developerA' into developer

src/main/java/com/caimei/service/auth/impl/AuthServiceImpl.java

@@ -1978,7 +1978,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public ResponseJson<PageInfo<RossChallengeVideo>> getVideoAll(String mobileOrAuthpart,Integer clubUserId,Integer authUserId,Integer pageNum,Integer pageSize){
         ChallengeActivityVo activityTime = authMapper.getActivityTime(authUserId);
-        if(null==activityTime&&StringUtils.isEmpty(activityTime.getStartTime())&&StringUtils.isEmpty(activityTime.getEndTime())){
+        if(null==activityTime){
             return ResponseJson.success();
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -2013,7 +2013,7 @@ public class AuthServiceImpl implements AuthService {
     public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId,Integer authUserId){
         //获取活动时间内的机构列表信息
         ChallengeActivityVo activityTime = authMapper.getActivityTime(authUserId);
-        if(null==activityTime&&StringUtils.isEmpty(activityTime.getStartTime())&&StringUtils.isEmpty(activityTime.getEndTime())){
+        if(null==activityTime){
             return ResponseJson.success();
         }
         List<RossChallengeVideo> videoByUsername = authMapper.getVideoByUsername(mobile,activityTime.getStartTime(),activityTime.getEndTime());