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

src/main/java/com/huiju/estateagents/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){
+                if (taBuilding != null && e.getIsHaveActive()){
                     e.setBuildingName(taBuilding.getBuildingName());
                 }
             });

src/main/java/com/huiju/estateagents/entity/ExtendContent.java

@@ -104,6 +104,8 @@ public class ExtendContent implements Serializable {
      */
     private Integer createUser;
 
+    private Boolean isHaveActive;
+
     /**
      * 排序
      */

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

@@ -191,7 +191,9 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             if (null != extendContent.getContentId()){
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }
-            taExtendContentQueryWrapper.eq("building_id", extendContent.getBuildingId());
+            if (extendContent.getIsHaveActive() != null && extendContent.getIsHaveActive()){
+                taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(extendContent.getBuildingId()), "building_id", extendContent.getBuildingId());
+            }
             List<ExtendContent> extContentInfo = extendContentMapper.selectList(taExtendContentQueryWrapper);
             if (!Collections.isEmpty(extContentInfo)){
                 return false;