* bug修复

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

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

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

@@ -29,5 +29,8 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
      * @param buildingId
      * @return
      */
-    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page, @Param("orgId") Integer orgId, @Param("buildingId") String buildingId);
+    IPage<Map<String, Object>> selectIntentionUser(IPage<Map<String, Object>> page,
+                                                   @Param("orgId") Integer orgId,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("userId") Integer userId);
 }

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

@@ -105,7 +105,7 @@ public interface IStatisticalService {
      * @param buildingId
      * @return
      */
-    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId);
+    ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId);
 
     /**
      * 用户来源数据 首页

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

@@ -62,7 +62,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean indexStatistical(Integer orgId) {
 
         ResponseBean responseBean = new ResponseBean();
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
 
         // 总用户数
         Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
@@ -165,7 +165,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
                 result.put("data_count", selectBuildingStatisticalSave);
                 break;
             case CommConstant.BUILDING_SHARE:
-                Map<String, Object> selectBuildingStatisticalShare = taBuildingMapper.selectBuildingStatistical(orgId,"share");
+                Map<String, Object> selectBuildingStatisticalShare = taBuildingMapper.selectBuildingStatistical(orgId, "share");
                 result.put("data_count", selectBuildingStatisticalShare);
                 break;
             case CommConstant.ACTIVITY_SAVE:
@@ -217,7 +217,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 用户来源饼状
         // 来源置业顾问, 来源客户，其他
-        Integer total = taPersonMapper.selectFromNum(orgId, null) ;
+        Integer total = taPersonMapper.selectFromNum(orgId, null);
         Integer person_realty_consultant = taPersonMapper.selectFromNum(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
         Integer person_estate_agent = taPersonMapper.selectFromNum(orgId, CommConstant.PERSON_ESTATE_CUSTOMER);
         Integer person_null = total - person_realty_consultant - person_estate_agent;
@@ -230,7 +230,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(orgId, CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
 
         Map<String, Object> result = new HashMap<>();
-        result.put("columnar", new ArrayList<Map<String,Object>>());
+        result.put("columnar", new ArrayList<Map<String, Object>>());
         result.put("pie", map);
         result.put("data", selectUserSourceData);
 
@@ -309,11 +309,11 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId) {
+    public ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
-        IPage<Map<String,Object>> pg = new Page<>(pageNum, pageSize);
-        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId);
+        IPage<Map<String, Object>> pg = new Page<>(pageNum, pageSize);
+        IPage<Map<String, Object>> page = taPersonIntentionRecordMapper.selectIntentionUser(pg, orgId, buildingId, userId);
 
         responseBean.addSuccess(page);
         return responseBean;
@@ -330,7 +330,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Override
     public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
-        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId, startDate, endDate);
         QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
         tdWxDictQueryWrapper.groupBy("scene_type");
         List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
@@ -340,10 +340,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
             e.setFromData(fromSum);
             e.setRegisterSum(registerSum);
         });
-        Map<String,Object> map = new HashMap<>();
-        map.put("tdWxDicts",tdWxDicts);
-        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
-        map.put("list",tableList);
+        Map<String, Object> map = new HashMap<>();
+        map.put("tdWxDicts", tdWxDicts);
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId, startDate, endDate);
+        map.put("list", tableList);
         responseBean.addSuccess(map);
         return responseBean;
     }
@@ -359,10 +359,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Override
     public ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate) {
         List<TsPersonFromStatistic> dayList = getDayList(startDate, endDate);
-        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFromGroupByDay(orgId,startDate,endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFromGroupByDay(orgId, startDate, endDate);
         dayList.forEach(e -> {
             list.forEach(l -> {
-                if (e.getCreateTime().equals(l.getCreateTime())){
+                if (e.getCreateTime().equals(l.getCreateTime())) {
                     e.setFromNum(l.getFromNum());
                     e.setRegisteredNum(l.getRegisteredNum());
                 }
@@ -373,12 +373,13 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
     /**
      * 返回时间区间格式
+     *
      * @param startDate
      * @param endDate
      * @return
      */
     private List<TsPersonFromStatistic> getDayList(LocalDate startDate, LocalDate endDate) {
-        if (null == startDate || null == endDate){
+        if (null == startDate || null == endDate) {
             endDate = LocalDate.now();
             startDate = LocalDate.now().plusDays(-7);
         }

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -31,6 +31,9 @@
                     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>
             </trim>
         GROUP BY
             tpir.person_id, tpir.building_id