Merge remote-tracking branch 'origin/master'

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

@@ -156,7 +156,7 @@ public class TaBuildingController extends BaseController {
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10")Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
-            @RequestParam(required = false) int cityId,
+            @RequestParam(required = false) Integer cityId,
             String name,
             HttpServletRequest request
     ){
@@ -171,7 +171,7 @@ public class TaBuildingController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets,cityId);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId);
     }
 
     /**

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

@@ -63,7 +63,7 @@ public class TaBuildingDynamicController extends BaseController {
     public ResponseBean iBuildingDynamicList(@RequestParam("pageNum")Integer pageNum,
                                              @RequestParam("pageSize")Integer pageSize,
                                              @RequestParam(required = false)String name,
-                                             @RequestParam(required = false)int cityId,
+                                             @RequestParam(required = false)Integer cityId,
                                              @RequestParam(required = false)String buildingId,
                                              HttpSession session){
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId);

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

@@ -78,7 +78,7 @@ public class TaNewsController extends BaseController {
     public ResponseBean wxTaNewsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                      @RequestParam(required = false) String buildingId,
-                                     @RequestParam(required = false) int cityId,
+                                     @RequestParam(required = false) Integer cityId,
                                      @RequestParam(defaultValue = "false") Boolean mine,
                                      HttpServletRequest request
     ){

src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java

@@ -26,7 +26,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") int cityId);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId);
 
     /**
      * 详情

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

@@ -22,7 +22,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,int cityId);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId);
 
     /**
      * 项目详情

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

@@ -107,7 +107,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -70,5 +70,5 @@ public interface ITaNewsService extends IService<TaNews> {
      */
     ResponseBean wxTaPvNum(Integer id);
 
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId);
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId);
 }

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

@@ -64,7 +64,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,int cityId) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);

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

@@ -311,13 +311,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
         buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.eq(cityId != 0,"city_id",cityId);
+        buildingQueryWrapper.eq(null != cityId && cityId != 0,"city_id", cityId);
         buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
 //        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");

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

@@ -182,13 +182,13 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     }
 
     @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId) {
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId) {
         IPage<TaNews> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
         taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
         taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
-        taNewsQueryWrapper.eq(cityId != 0,"city_id",cityId);
+        taNewsQueryWrapper.eq(null != cityId && cityId != 0,"city_id",cityId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);