Merge branch 'developer' into developerA

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

@@ -1513,10 +1513,12 @@ public class AuthServiceImpl implements AuthService {
         String releaseTime = sf.format(date).replace("T", "");
         ChallengeActivityVo activityTime = authMapper.getActivityTime(authUserId);
         //如果当前时间大于结束时间则活动状态置为未开启状态
-        if(activityTime.getEndTime().compareTo(releaseTime)<0){
-            activityTime.setStatus(0);
-            authMapper.upStatusById(activityTime.getId());
-            //
+        if(activityTime!=null){
+            if(activityTime.getEndTime().compareTo(releaseTime)<0){
+                activityTime.setStatus(0);
+                authMapper.upStatusById(activityTime.getId());
+                //
+            }
         }
         return ResponseJson.success(activityTime);
     }