兼容微信小程序，当未勘察时。返回空的对象

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -187,29 +187,41 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         surveyDetailsQueryWrapper.eq("survey_information_id", surveyInformationId);
         SurveyDetails surveyDetails = surveyDetailsService.getBaseMapper().selectOne(surveyDetailsQueryWrapper);
 
-        surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
+        if(surveyDetails == null){
+            surveyInfoAllDto.setSurveyDetails(new SurveyDetailsDto());
+        }else {
+            surveyInfoAllDto.setSurveyDetails(BeanDtoUtils.convert(surveyDetails, SurveyDetailsDto.class));
+        }
 
         QueryWrapper<Information> informationQueryWrapper = new QueryWrapper<>();
         informationQueryWrapper.eq("survey_information_id", surveyInformationId);
         Information information = informationService.getBaseMapper().selectOne(informationQueryWrapper);
 
-        surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
-
+        if(information == null){
+            surveyInfoAllDto.setInformation(new InformationDto());
+        }else {
+            surveyInfoAllDto.setInformation(BeanDtoUtils.convert(information, InformationDto.class));
+        }
         QueryWrapper<Commercial> commercialQueryWrapper = new QueryWrapper<>();
         commercialQueryWrapper.eq("survey_information_id", surveyInformationId);
         Commercial commercial = commercialService.getBaseMapper().selectOne(commercialQueryWrapper);
-
-        surveyInfoAllDto.setCommercial(BeanDtoUtils.convert(commercial, CommercialDto.class));
-        if(commercial !=null && !StringUtils.isEmpty(commercial.getProjectAddressName())){
-            surveyInfoAllDto.getCommercial().setProjectAddressText(Arrays.asList(commercial.getProjectAddressName().split("/")));
+        if(information == null){
+            surveyInfoAllDto.setCommercial(new CommercialDto());
+        }else {
+            surveyInfoAllDto.setCommercial(BeanDtoUtils.convert(commercial, CommercialDto.class));
+            if(commercial !=null && !StringUtils.isEmpty(commercial.getProjectAddressName())){
+                surveyInfoAllDto.getCommercial().setProjectAddressText(Arrays.asList(commercial.getProjectAddressName().split("/")));
+            }
         }
 
         QueryWrapper<ExtendedInformation> extendedInformationQueryWrapper = new QueryWrapper<>();
         extendedInformationQueryWrapper.eq("survey_information_id", surveyInformationId);
         ExtendedInformation extendedInformation = extendedInformationService.getBaseMapper().selectOne(extendedInformationQueryWrapper);
-
-        surveyInfoAllDto.setExtendedInformation(BeanDtoUtils.convert(extendedInformation, ExtendedInformationDto.class));
-
+        if(information == null){
+            surveyInfoAllDto.setExtendedInformation(new ExtendedInformationDto());
+        }else {
+            surveyInfoAllDto.setExtendedInformation(BeanDtoUtils.convert(extendedInformation, ExtendedInformationDto.class));
+        }
         return surveyInfoAllDto;
     }