|
@@ -523,8 +523,9 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
|
|
|
if (contentOptionList.get(i).getId() == recordOptionList.get(j).getContentOptionId()) {
|
|
|
contentOptionVo.setSelectStatus(true);
|
|
|
contentOptionVo.setRemarks(recordOptionList.get(j).getRemarks());
|
|
|
+ }
|
|
|
+ if (contentOptionList.get(i).getContentId()==recordOptionList.get(j).getContentId()){
|
|
|
contentOptionVo.setContent(recordOptionList.get(i).getContent());
|
|
|
- contentOptionVo.setContentId(recordOptionList.get(i).getContentId());
|
|
|
}
|
|
|
}
|
|
|
contentOptionVoList.add(contentOptionVo);
|