bug fix

src/main/java/com/huiju/estateagents/controller/TaNewsController.java

@@ -82,8 +82,9 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value = "buildingId", required = false) String buildingId,
                                    @RequestParam(value = "newsTypeId", required = false) Integer newsTypeId,
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
-                                   @RequestParam(value = "title", required = false) String title){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus,title);
+                                   @RequestParam(value = "title", required = false) String title,
+                                   @RequestParam(value = "cityId", required = false) Integer cityId){
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/service/ITaNewsService.java

@@ -26,7 +26,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId);
 
     /**
      * 根据Id查询资讯数据

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

@@ -58,7 +58,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -71,6 +71,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
         taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");