Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

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

 //        page.setSize(pageSize == null ? 10 : pageSize);
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
         List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
 //        page.setRecords(building);
         return ResponseBean.success(building);
     }

src/main/resources/mapper/TaShareCountMapper.xml

                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
 
-        LEFT JOIN ta_person a ON t.share_person = a.person_id or t.share_person = a.user_id
+        LEFT JOIN ta_person a ON t.share_person = a.person_id
+        LEFT JOIN ta_person y on t.share_person = y.user_id
         LEFT JOIN ta_person z ON t.person_id = z.person_id
         WHERE
             (t.share_person = (select user_id from ta_person where person_id = #{personId}) or t.share_person = #{personId})

src/main/resources/mapper/TaSharePersonFromMapper.xml

 <mapper namespace="com.huiju.estateagents.mapper.TaSharePersonFromMapper">
 
     <select id="countViewNum" resultType="java.lang.Integer">
-      select count(*) from (
+        select count(*) from (
         select count(1) from ta_share_person_from t
-        left join ta_person a on t.share_person = a.person_id or t.share_person = a.user_id
+        left join ta_person a on t.share_person = a.person_id
+        left join ta_person b on t.share_person = b.user_id
         where
-        (t.share_person = #{userId}
+        t.share_person in (#{userId}
         <if test="personId != null and personId != ''">
-            or t.share_person = #{personId}
+            ,#{personId}
         </if>
         )
         and t.org_id = #{orgId} and t.status = 1 and t.person_id != #{personId}
             and  date_format(t.create_date,'%Y-%m-%d') &lt;= date_format(#{endCreateDate},'%Y-%m-%d')
         </if>
         GROUP BY t.person_id
-      ) t
+        ) t
     </select>
 
     <select id="selectHouseVisitList" resultType="com.huiju.estateagents.entity.TaSharePersonFrom">