bug

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

@@ -160,8 +160,7 @@ public class StatisticalController extends BaseController {
                                             @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
                                             @RequestParam(value = "buildingId", required = false) String buildingId,
                                             HttpServletRequest request) {
-        Integer userId = getUserId(request);
-        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, userId);
+        return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
     }
 
     /**

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

@@ -3,10 +3,12 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,5 +34,5 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
     IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page,
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
-                                                   @Param("userId") Integer userId);
+                                                   @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -1,9 +1,11 @@
 package com.huiju.estateagents.service;
 
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 数据统计 接口
@@ -105,7 +107,7 @@ public interface IStatisticalService {
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
 
     /**
      * 用户来源数据 首页

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.exception.EstaException;
@@ -309,11 +310,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId) {
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<Map<String, Object>> pg = new Page<>(pageNum, pageSize);
-        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, userId);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, taPersonBuildingListByUserId);
 
         responseBean.addSuccess(page);
         return responseBean;

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -31,8 +31,11 @@
                     AND tpir.org_id = #{orgId}
                     AND tp.org_id = #{orgId}
                 </if>
-                <if test="userId != null">
-                    AND tpir.building_id IN ( SELECT t3.building_id FROM ta_person_building t3 WHERE t3.user_id = #{userId} )
+                <if test="personBuildingList != null and personBuildingList.size > 0">
+                    AND tpir.building_id in
+                    <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                        #{personBuilding.buildingId}
+                    </foreach>
                 </if>
             </trim>
         GROUP BY