bug

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

             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-//            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
 

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

         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=推荐客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
+        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request),getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
         do {
-            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;

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

      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取推荐用户数据 总数
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId);
+    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据 总数

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

      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize);
+    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(推荐客户) 总数
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(Integer orgId);
+    Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户) 总数

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

 
 
     @Override
-    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize);
+    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize,taPersonBuildingList);
     }
 
     @Override
-    public Integer getRecCustomerExportCount(Integer orgId) {
-        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId);
+    public Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId,taPersonBuildingList);
     }
 
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         order by a.create_date desc
         limit #{pageCode}, #{pageSize}
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
     </select>