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

src/main/java/com/huiju/estateagents/excel/AgentsRecommendCustomer.java

@@ -55,8 +55,8 @@ public class AgentsRecommendCustomer {
     /**
      * 邀请经纪人（数量）
      */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "邀请经纪人（数量）", index = 6)
-    private String agentCount;
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "邀请经纪人（数量）", index = 6)
+//    private String agentCount;
 
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -196,7 +196,7 @@
 
     <select id="getBuildingListById" resultType="com.huiju.estateagents.entity.TaBuilding">
       select * from ta_building t where t.building_id in (
-	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} group by t.building_id
+	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} and `status`=1 group by t.building_id
       )
     </select>