bug

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

@@ -48,7 +48,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param personBuildingList
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -492,7 +492,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList);
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList,building);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -267,6 +267,9 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
+            <if test="buildingId != null and buildingId !=''">
+                AND r.building_id = #{buildingId}
+            </if>
             and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
             <if test="personBuildingList != null and personBuildingList.size > 0">
                 AND r.building_id in