优化

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

@@ -791,15 +791,15 @@ public class TaRecommendCustomerController extends BaseController {
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-公客").build();
 
-            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
-            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
-            List<PublicCustomerExport> publicList = null;
-            do {
-                publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+//            Integer count = taRecommendCustomerMapper.getPublicCustomerExportListCount(name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+//            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+//            List<PublicCustomerExport> publicList = null;
+//            do {
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
                 excelWriter.write(publicList, writeSheet);
 
-                pageCode ++;
-            } while (pageCode <= pageCount);
+//                pageCode ++;
+//            } while (pageCode <= pageCount);
 
             // finish 会帮忙关闭流
             excelWriter.finish();
@@ -813,15 +813,15 @@ public class TaRecommendCustomerController extends BaseController {
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
 
-            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
-            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
-            List<PrivateCustomerExport> privateList = null;
-            do {
-                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
+//            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
+//            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
+//            List<PrivateCustomerExport> privateList = null;
+//            do {
+                List<PrivateCustomerExport> privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(privateList, writeSheet);
 
-                pageCode ++;
-            } while (pageCode <= pageCount);
+//                pageCode ++;
+//            } while (pageCode <= pageCount);
             // finish 会帮忙关闭流
             excelWriter.finish();
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -547,12 +547,12 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
+            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
             AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
         </where>
         order by b.create_date desc
-        limit #{pageCode}, #{pageSize}
     </select>
+    <!--        limit #{pageCode}, #{pageSize}-->
 
     <select id="getCustomerExportListCount" resultType="Integer" >
         SELECT
@@ -671,8 +671,8 @@ FROM
         </where>
         group by a.customer_id,a.building_id
         order by a.create_date desc
-        limit #{pageCode}, #{pageSize}
     </select>
+    <!--        limit #{pageCode}, #{pageSize}-->
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT