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

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

@@ -102,7 +102,7 @@ public class TaPolicyController extends BaseController {
     @RequestMapping(value="/wx/taPolicy",method= RequestMethod.GET)
     public ResponseBean taPolicyListCity(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="cityId", required = false) Integer cityId){
+                                         @RequestParam(value ="cityId", required = false) Integer cityId,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -110,6 +110,7 @@ public class TaPolicyController extends BaseController {
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("city_id",cityId);
             queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 

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

@@ -295,7 +295,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             }
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         } else {
-            result.put("liked", true);
+            List<TaFavor> taUvList = getFavorListBy(person, person);
+            result.put("liked", null != taUvList && taUvList.size() > 0);
             Integer unReadNum = taChatMapper.getAllUnReadMessage(person.getPersonId());
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         }