Merge remote-tracking branch 'origin/master'

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

@@ -63,7 +63,7 @@ public class TaPolicyController extends BaseController {
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(null != cityId,"city_id",cityId);
             queryWrapper.orderByDesc("weight", "create_date");
-            queryWrapper.eq("status", 1);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -90,8 +90,9 @@ public class TaPolicyController extends BaseController {
             IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("city_id",cityId);
+            queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);
             queryWrapper.orderByDesc("weight", "create_date");
-            queryWrapper.eq("status", 1);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);