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

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

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareCount;
         List<TaPersonBuilding> list = taPersonBuildingMapper.selectListByParams(page, orgId, buildingId, startCreateDate, endCreateDate, taPersonBuildingList);
         for (TaPersonBuilding taPersonBuilding : list) {
             QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            if (StringUtils.isEmpty(taPersonBuilding.getPersonId())){
+                taPersonBuilding.setClickNum(0);
+                taPersonBuilding.setShareCount(0);
+                continue;
+            }
             taPersonQueryWrapper.eq("person_id", taPersonBuilding.getPersonId());
             TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
             taPersonBuilding.setShareCount(taShareCountMapper.countShare(taPersonBuilding.getPersonId(), orgId, startCreateDate, endCreateDate));

src/main/resources/mapper/TaPersonBuildingMapper.xml

 <mapper namespace="com.huiju.estateagents.mapper.TaPersonBuildingMapper">
 
     <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaPersonBuilding">
-        select  a.building_id, t.user_name as consultantName, d.building_name, b.person_id From ta_user t
+        select  a.building_id, t.user_name as consultantName, d.building_name, b.person_id, t.user_id From ta_user t
         left join ta_person_building a on t.user_id = a.user_id
         left join ta_person b on t.user_id = b.user_id
         left join ta_share_count c on b.person_id = c.person_id