移动端-巡检计划检查项查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -505,7 +505,9 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                 queryWrapper.eq(PatrolInspectionRecordOption::getRecordId, recordId);
                 List<PatrolInspectionRecordOption> recordOptionList = patrolInspectionRecordOptionService.list(queryWrapper);
                 for (int i = 0; i < recordOptionList.size(); i++) {
-                    contentOptionIdList.add(recordOptionList.get(i).getContentOptionId());
+                    if (recordOptionList.get(i).getContentOptionId()!=null){
+                        contentOptionIdList.add(recordOptionList.get(i).getContentOptionId());
+                    }
                 }
 
                 List<PatrolInspectionContentOption> contentOptionVoList = new ArrayList<>();
@@ -517,16 +519,18 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
                     contentOptionList.get(i).setEnable(contentOptionList.get(i).getEnable());
                     contentOptionList.get(i).setSelectStatus(false);
                     for (int j = 0; j < recordOptionList.size(); j++) {
-                        int contentOptionId1 = contentOptionList.get(i).getId();
-                        int contentOptionId2 = recordOptionList.get(j).getContentOptionId();
-                        if (contentOptionId1 == contentOptionId2) {
-                            contentOptionList.get(i).setSelectStatus(true);
-                            contentOptionList.get(i).setRemarks(recordOptionList.get(j).getRemarks());
+                        if (recordOptionList.get(j).getContentOptionId()!=null){
+                            int contentOptionId1 = contentOptionList.get(i).getId();
+                            int contentOptionId2 = recordOptionList.get(j).getContentOptionId();
+                            if (contentOptionId1 == contentOptionId2) {
+                                contentOptionList.get(i).setSelectStatus(true);
+                                contentOptionList.get(i).setRemarks(recordOptionList.get(j).getRemarks());
+                            }
                         }
                         int contentId1 = contentOptionList.get(i).getContentId();
                         int contentId2 = recordOptionList.get(j).getContentId();
                         if (contentId1 == contentId2) {
-                            contentOptionList.get(i).setContent(recordOptionList.get(i).getContent());
+                            contentOptionList.get(i).setContent(recordOptionList.get(j).getContent());
                         }
                     }
                     contentOptionVoList.add(contentOptionList.get(i));