bug fix

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

@@ -357,7 +357,7 @@ public class TaPersonVisitRecordController extends BaseController {
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
             switch (e.getEventType()){
                 case CommConstant.FAVOR_PROJECT:
                     e.setActivityShareNum(shareNum);

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -52,7 +52,7 @@ public class TaBuilding implements Serializable {
     /**
      * 开盘时间
      */
-    private LocalDateTime openingDate;
+    private String openingDate;
 
     /**
      * 项目地址

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

@@ -82,5 +82,5 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
 
     IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("personId") String personId);
 
-    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("userId")Integer userId, @Param("eventType")String eventType);
+    Integer countShareNumByEventType(@Param("orgId")Integer orgId, @Param("targetId") String targetId, @Param("userId")Integer userId, @Param("eventType")String eventType);
 }

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

@@ -62,5 +62,5 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 
 	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId);
 
-	Integer countShareNumByEventType(String targetId, Integer userId, String eventType);
+	Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String eventType);
 }

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

@@ -458,9 +458,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        if(null!= object.getDate("openingDate")){
-            building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
-        }
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);

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

@@ -170,8 +170,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public Integer countShareNumByEventType(String targetId, Integer userId, String eventType) {
-		return personVisitRecordMapper.countShareNumByEventType(targetId, userId, eventType);
+	public Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String eventType) {
+		return personVisitRecordMapper.countShareNumByEventType(orgId, targetId, userId, eventType);
 	}
 
 	/**

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -328,6 +328,7 @@
         select count(DISTINCT t.person_id)  from ta_share_person_from t
         where
         t.share_person = #{userId}
+        and t.orgId = #{orgId}
         and t.target_type = #{eventType}
         and t.target_id = #{targetId}
         group by t.target_type