瀏覽代碼

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

傅行帆 5 年之前
父節點
當前提交
b71ab9642e

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java 查看文件

@@ -359,7 +359,7 @@ public class TaPersonVisitRecordController extends BaseController {
359 359
         taConsultantInfos.forEach(e ->{
360 360
             Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : e.getEventType()) + "_share");
361 361
             switch (e.getEventType()){
362
-                case CommConstant.FAVOR_PROJECT:
362
+                case CommConstant.FAVOR_ACTIVITY:
363 363
                     e.setActivityShareNum(shareNum);
364 364
                     break;
365 365
                 case CommConstant.POINTS_CHANGE_HELP:
@@ -371,7 +371,7 @@ public class TaPersonVisitRecordController extends BaseController {
371 371
                 case CommConstant.CAROUSEL_NEWS:
372 372
                     e.setNewsNum(shareNum);
373 373
                     break;
374
-                case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
374
+                case CommConstant.FAVOR_PROJECT:
375 375
                     e.setBuildingNum(shareNum);
376 376
                     break;
377 377
                 case CommConstant.EVENT_H5:

+ 2
- 1
src/main/resources/mapper/TaPersonVisitRecordMapper.xml 查看文件

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