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

src/main/resources/mapper/TaBuildingMapper.xml

@@ -271,13 +271,13 @@
                 b.*,
                 d.building_name
             FROM
-                ta_person b
+                ta_recommend_customer b
             LEFT JOIN ta_building d ON b.building_id = d.building_id
             WHERE
                 b.STATUS > 0
                 AND b.org_id = #{orgId}
-                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
-                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+                AND b.verify_status = 1
+                AND ( b.realty_consultant IS NULL OR b.realty_consultant = '' )
                 <if test="personBuildingList != null and personBuildingList.size > 0">
                     AND b.building_id in
                     <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
@@ -427,12 +427,12 @@
                 SELECT
                     b.*
                 FROM
-                    ta_person b
+                    ta_recommend_customer b
                 WHERE
                     b.STATUS > 0
                     AND b.org_id = #{orgId}
-                    AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
-                    AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+                    AND b.verify_status = 1
+                    AND ( b.realty_consultant IS NULL OR b.realty_consultant = '' )
                     <if test="startDate != null">
                         and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
                     </if>

src/main/resources/mapper/TaUserMapper.xml

@@ -80,7 +80,7 @@
             <if test="taUser.status != null and taUser.status != ''">
                 and t.status = #{taUser.status}
             </if>
-            <if test="taUser.isConsultant == 0">
+            <if test="taUser.isConsultant != null">
                 and t.is_consultant = #{taUser.isConsultant}
             </if>
             <if test="taUser.miniStatus == 0">