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

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

@@ -81,6 +81,21 @@ public class TaNews implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 阅读量
+     */
+    private Integer pvNum;
+
+    /**
+     * 点赞量
+     */
+    private Integer favorNum;
+
+    /**
+     * 收藏量
+     */
+    private Integer saveNum;
+
     /**
      * 类型
      */

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

@@ -18,6 +18,7 @@ import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaFavorService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,7 +61,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         page.setSize(pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(buildingId != null,"building_id", buildingId);
+        taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);