bug

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

@@ -819,7 +819,7 @@ public class TaRecommendCustomerController extends BaseController {
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;

src/main/java/com/huiju/estateagents/entity/ExtendContent.java

@@ -1,9 +1,7 @@
 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
@@ -104,5 +102,6 @@ public class ExtendContent implements Serializable {
     /**
      * 排序
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer orderNo;
 }

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

@@ -119,7 +119,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @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);
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @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);
 
     /**
      * 导出数据 私客总数

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -567,6 +567,12 @@ FROM
             <if test="buildingId != null and buildingId !=''">
                 AND r.building_id = #{buildingId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND r.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')
             </if>