朋友圈

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

@@ -65,13 +65,13 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
     @Override
     public ServiceResponse<Page<QwMomentPlanAttendDTO>> attendList(PlanClerkListQDTO qdto) {
         // 0已失效 1待完成 2已完成
-        int sendStatus = qdto.getSendStatus() ;
+        Integer sendStatus = qdto.getSendStatus() ;
         TabQwMomentPlan plan = this.qwMomentPlanMapper.getById(qdto.getPlanId()) ;
         boolean isEnd = plan.getStatusFlag()==2 || plan.getEndDate().getTime() <= System.currentTimeMillis() ;
-        if(isEnd && sendStatus==1) {
+        if(null != sendStatus && isEnd && sendStatus==1) {
             return ServiceResponse.success(new Page<>());
         }
-        if(!isEnd && sendStatus==0) {
+        if(null != sendStatus && !isEnd && sendStatus==0) {
             return ServiceResponse.success(new Page<>());
         }
         PageHelper.startPage(qdto);
@@ -89,7 +89,7 @@ public class QwMomentPlanAttendServiceImpl implements QwMomentPlanAttendService
         }
         List<QwMomentPlanAttendDTO> list = this.qwMomentPlanAttendMapper.list(qdto);
         Page<QwMomentPlanAttendDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, QwMomentPlanAttendDTO.class);
-        if(CollectionUtils.isNotEmpty(retPage.getResult()) && sendStatus==0) {
+        if(CollectionUtils.isNotEmpty(retPage.getResult())  && null != sendStatus && sendStatus==0) {
             retPage.getResult().forEach(o->o.setTaskStatus(0));
         }
         return ServiceResponse.success(retPage);