Merge branch 'feature/xgh/2502朋友圈' into 'master'

非空判断

See merge request !2726

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/moment/impl/QwMomentPlanAttendServiceImpl.java

@@ -203,7 +203,10 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         Long attendId = dto.getAttendId() ;
         TabQwMomentPlanAttend attend = this.qwMomentPlanAttendMapper.getById(attendId) ;
         TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(planId) ;
-        if(null !=plan && plan.getStatusFlag()==1 && plan.getEndDate().getTime() + 1000*60*60*24*3L > System.currentTimeMillis()) {
+        if(null == plan) {
+            return ServiceResponse.failure("9999","活动不存在或已删除");
+        }
+        if(plan.getStatusFlag()==1 && plan.getEndDate().getTime() + 1000*60*60*24*3L > System.currentTimeMillis()) {
             this.qwMomentPlanService.getQwData(attend, 1, plan.getMomentId());
         }
         return ServiceResponse.success(dto);