Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -113,12 +113,15 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             housingQueryWrapper.ne("status", -1);
             TaHousingResources housingResources = taHousingResourcesService.getOne(housingQueryWrapper);
             //户型图name
-            TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
-            if (null != buildingApartment){
-                housingResources.setApartmentName(buildingApartment.getApartmentName());
-                housingResources.setBuildingArea(buildingApartment.getBuildingArea());
-                housingResources.setInsideArea(buildingApartment.getInsideArea());
+            if (null != housingResources){
+                TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(housingResources.getApartmentId());
+                if (null != buildingApartment){
+                    housingResources.setApartmentName(buildingApartment.getApartmentName());
+                    housingResources.setBuildingArea(buildingApartment.getBuildingArea());
+                    housingResources.setInsideArea(buildingApartment.getInsideArea());
+                }
             }
+
             record.setHousingInfo(housingResources);
         });