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

# Conflicts:
#	src/main/resources/mapper/TaPersonVisitRecordMapper.xml

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

@@ -159,7 +159,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         }
 
         // 更新消息发送时间
-        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
+        iTaPersonMessageRuleService.shareRecords(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
     
     @Override

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

@@ -333,7 +333,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 consultantPerson = taPersonMapper.selectOne(query);
             }
         } else {
-            consultantUser = taUserMapper.selectById(params.getString("realtyConsultant"));
+            consultantUser = taUserMapper.selectById(consultantPerson.getUserId());
         }
 
         if (null == consultantUser || consultantUser.getStatus() != CommConstant.STATUS_NORMAL) {

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -306,8 +306,16 @@
             left JOIN ta_person p on t.person_id = p.person_id
         GROUP BY
             t.person_id
-        ORDER BY
 	        t.visit_time DESC ) t;
+        ORDER BY
+        select count(DISTINCT t.person_id) from ta_person_visit_record t
+        where
+        t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.event_type = #{eventType}
+        and t.target_id = #{targetId}
+        and t.person_id != t.share_person_id
+        group by t.event_type
     </select>
 
 </mapper>