bug fix

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

@@ -881,7 +881,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         // 3. 处理推广人
         TaPerson recPerson = taPersonMapper.getById(promoter);
-        if (CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
+        if (recPerson != null && CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
             recPerson = null;
         }
 
@@ -916,6 +916,11 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             }
         }
 
+        // 没有置业, 也没楼盘
+        if (recPerson == null || taBuilding == null) {
+            return ;
+        }
+
         // 3. 处理客户, 没有新增一条记录, 有就依据手机号建立关联
         TaRecommendCustomer customer = mergeCustomerByPhone(person, taUser, taBuilding, isAssociated, now);
 
@@ -974,7 +979,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
                 customer.setRealtyConsultant(taUser.getUserId().toString());
             }
 
-            if (isAssociated || null == taUser) {
+            if (null != building && (isAssociated || null == taUser)) {
                 customer.setBuildingId(building.getBuildingId());
                 customer.setIntention(building.getBuildingName());
             }
@@ -992,7 +997,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
                     customer.setRealtyConsultant(taUser.getUserId().toString());
                 }
 
-                if (isAssociated || null == taUser) {
+                if (building != null && (isAssociated || null == taUser)) {
                     if (StringUtils.isEmpty(customer.getBuildingId())) {
                         customer.setBuildingId(building.getBuildingId());
                     }