修复 bug

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

@@ -37,7 +37,8 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
                                          @Param("buildingId") String buildingId,
                                          @Param("eventType") String eventType,
                                          @Param("event") String event,
-                                         @Param("activity") String activity);
+                                         @Param("activity") String activity,
+                                         @Param("orgId") Integer orgId);
 
 
     /**

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

@@ -178,7 +178,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate, buildingId, eventType, event, activity);
 
         IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
-        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, startDate, endDate, buildingId, eventType, event, activity);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page, startDate, endDate, buildingId, eventType, event, activity, orgId);
 
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -17,8 +17,8 @@
             tpvr.event as event,
             tpvr.event_type as eventType,
             tpvr.visit_duration as visitDuration,
-            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as visitTime,
-            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event ) as leaveTime,
+            (SELECT MIN(t.visit_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as visitTime,
+            (SELECT MAX(t.leave_time) FROM ta_person_visit_record t WHERE t.person_id = tpvr.person_id and t.event = tpvr.event and t.org_id = #{orgId} ) as leaveTime,
             ifnull(tp.name, tp.nickname) as userName,
             tbe.event_name as eventName,
             COUNT(1) as accessCount
@@ -27,6 +27,8 @@
             LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
             LEFT JOIN td_biz_event tbe on tpvr.event = tbe.event_code
             <trim prefix="where" prefixOverrides="and | or">
+                tpvr.org_id = #{orgId}
+                and tp.org_id = #{orgId}
                 <if test="startDate != null and endDate != null">
                     and tpvr.visit_time between #{startDate} and #{endDate}
                 </if>