bug fix

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

@@ -2,14 +2,21 @@ package com.huiju.estateagents.controller;
 
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaSaveService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * <p>
@@ -26,6 +33,12 @@ public class TaBuildingController extends BaseController {
     @Autowired
     ITaBuildingService taBuildingService;
 
+    @Autowired
+    ITaSaveService iTaSaveService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
     /**
      * 楼盘详情
      * @param id
@@ -142,9 +155,22 @@ public class TaBuildingController extends BaseController {
     public ResponseBean getWxBuildingList(
             @RequestParam(defaultValue = "1") Integer pageNum,
             @RequestParam(defaultValue = "10")Integer pageSize,
-            String name
+            @RequestParam(defaultValue = "false") Boolean mine,
+            String name,
+            HttpServletRequest request
     ){
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name);
+        List<String> targets = null;
+        if (null != mine && mine) {
+            String openid = JWTUtils.getSubject(request);
+            List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
+            if (null == persons || persons.size() == 0) {
+                return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
+        }
+
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets);
     }
 
     /**

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaSave;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaSaveMapper extends BaseMapper<TaSave> {
 
+    List<String> getTargesOfPerson(@Param("personId") String personId, @Param("tagertType") String tagertType);
 }

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

@@ -4,6 +4,8 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 项目表 服务类
@@ -105,7 +107,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets);
 
     /**
      * 微信小程序 楼盘列表

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSave;
 
+import java.util.List;
+
 /**
  * <p>
  * 收藏表  服务类
@@ -19,4 +21,5 @@ public interface ITaSaveService extends IService<TaSave> {
 
     ResponseBean cancelLike(String openid, String typeOf, String like);
 
+    List<String> getTargesOfPerson(String personId, String tagertType);
 }

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

@@ -45,6 +45,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     TaBuildingApartmentMapper taBuildingApartmentMapper;
 
+    @Autowired
+    TaSaveMapper taSaveMapper;
+
     @Autowired
     TaUvMapper taUvMapper;
 
@@ -308,13 +311,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets) {
         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.like(null != name && !"".equals(name.trim()), "name", name);
+        buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
+//        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");
 
         IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);

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

@@ -134,6 +134,11 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         return ResponseBean.success("");
     }
 
+    @Override
+    public List<String> getTargesOfPerson(String personId, String tagertType) {
+        return taSaveMapper.getTargesOfPerson(personId, tagertType);
+    }
+
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }

src/main/resources/mapper/TaSaveMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaSaveMapper">
+    <select id="getTargesOfPerson" resultType="string">
+        SELECT
+            t.saved_target
+        FROM
+            ta_save t
+        WHERE
+            t.person_id = #{personId}
+        AND t.tagert_type = #{tagertType}
+    </select>
+</mapper>