11

src/main/java/com/yunzhi/marketing/controller/ExtendContentController.java

@@ -111,7 +111,7 @@ public class ExtendContentController extends BaseController {
                 taBuildingQueryWrapper.eq("building_id", e.getBuildingId());
                 TaBuilding taBuilding = iTaBuildingService.getOne(taBuildingQueryWrapper);
                 e.setCityName(null == tdCity ? "" : tdCity.getName());
-                if (taBuilding != null && e.getIsHaveActive()){
+                if (null != taBuilding && null != e.getIsHaveActive() && e.getIsHaveActive()){
                     e.setBuildingName(taBuilding.getBuildingName());
                 }
             });