合并

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v2.5.1</version>
+	<version>v3.0.0</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -46,8 +46,8 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @return
      */
     @ResultType(TaPersonVisitRecord.class)
-    @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
-    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId);
+    @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId} and org_id = #{orgId} ")
+    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") String personId, @Param("orgId") Integer orgId);
 
 
 

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

@@ -191,7 +191,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectEventAll(Integer orgId, String event, String personId) {
         ResponseBean responseBean = new ResponseBean();
 
-        List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);
+        List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId, orgId);
         responseBean.addSuccess(taPersonVisitRecords);
         return responseBean;
     }