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

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -438,7 +438,7 @@
         FROM
         ta_person_visit_record tp
         where tp.org_id = #{orgId} AND
-        tp.event  = 'index'
+        tp.event  = 'start'
         AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
     </select>
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -309,6 +309,9 @@ FROM
             <if test="belongStatus == 0">
                 and (t.building_id = ''  OR t.building_id is null )
             </if>
+            <if test="belongStatus == 1">
+                and t.building_id is not null
+            </if>
         </where>
         order by t.create_date desc
     </select>
@@ -581,7 +584,7 @@ FROM
         t.create_date,
         concat( t.country, t.province ) AS province,
         t.intention,
-        IF(t.building_id = null or t.building_id = '','否','是') AS belongStatus,
+        IF(t.building_id is null or t.building_id = '','否','是') AS belongStatus,
         IFNULL( t2.building_name, '暂无' ) AS buildingName,
         t5.scene_alias as sceneType,
         ifnull( t3.nickname, t3.NAME ) AS sharePersonName ,
@@ -631,6 +634,9 @@ FROM
         <if test="belongStatus == 0">
             and (t.building_id = ''  OR t.building_id is null )
         </if>
+        <if test="belongStatus == 1">
+            and t.building_id is not null
+        </if>
         order by t.create_date desc
     </select>
     <!--    limit #{pageCode}, #{pageSize}-->