Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -359,7 +359,7 @@ public class TaPersonVisitRecordController extends BaseController {
         taConsultantInfos.forEach(e ->{
             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:
+                case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
                 case CommConstant.POINTS_CHANGE_HELP:
@@ -371,7 +371,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.CAROUSEL_NEWS:
                     e.setNewsNum(shareNum);
                     break;
-                case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
+                case CommConstant.FAVOR_PROJECT:
                     e.setBuildingNum(shareNum);
                     break;
                 case CommConstant.EVENT_H5:

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -328,9 +328,10 @@
         select count(DISTINCT t.person_id)  from ta_share_person_from t
         where
         t.share_person = #{userId}
-        and t.orgId = #{orgId}
+        and t.org_id = #{orgId}
         and t.target_type = #{eventType}
         and t.target_id = #{targetId}
+        and t.status = 1
         group by t.target_type
     </select>