bug fix

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -274,15 +275,18 @@ public class TaHousingResourcesController extends BaseController {
                     }
                 });
                 //我的认筹和锁定
-                taRaiseHouseList.forEach(r -> {
-                    //我的认筹
-                    if (e.getHouseId().equals(r.getHouseId())) {
-                        e.setMineRaise("mine");
-                        if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
-                            e.setMineLocked("mine");
+                if (CollectionUtils.isNotEmpty(taRaiseRecordList)){
+                    taRaiseHouseList.forEach(r -> {
+                        //我的认筹
+                        if (e.getHouseId().equals(r.getHouseId())) {
+                            e.setMineRaise("mine");
+                            if (CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(e.getHouseLockingStatus()) && personId.equals(e.getHouseLockingPerson())) {
+                                e.setMineLocked("mine");
+                            }
                         }
-                    }
-                });
+                    });
+                }
+
 
                 //塞入户型信息
                 if (!StringUtils.isEmpty(e.getApartmentId())) {

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

@@ -159,8 +159,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 			taPersonQueryWrapper.eq("user_id", e.getSharePersonId());
 			TaPerson taPersonUser = taPersonMapper.selectOne(taPersonQueryWrapper);
 
-			e.setShareName(userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
-			e.setShareTel(userShareInfo == null ? taPersonUser.getPhone() :userShareInfo.getPhone());
+			e.setShareName((userShareInfo == null &&  taPersonUser == null) ? null : userShareInfo == null ? taPersonUser.getNickname() : userShareInfo.getNickname());
+			e.setShareTel((userShareInfo == null &&  taPersonUser == null) ? null : userShareInfo == null ? taPersonUser.getPhone(): userShareInfo.getPhone());
 
 			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getDrainageName());