|
@@ -166,7 +166,11 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
|
|
|
//跟进记录
|
|
|
JSONObject followUpRecord = kuaishouPromoterMapper.getFollowUpRecordsByUserId(promoter.getPromoterId(), promoter.getUserId());
|
|
|
data.put("followUpRecord", followUpRecord);
|
|
|
- List<JSONObject> followUpRecordList = kuaishouPromoterMapper.getFollowUpRecordListByPromoterId(promoter.getPromoterId(), followUpRecord.getLong("id"));
|
|
|
+ Long followUpRecordId = null;
|
|
|
+ if (Check.isNotNull(followUpRecord)) {
|
|
|
+ followUpRecordId = followUpRecord.getLong("id");
|
|
|
+ }
|
|
|
+ List<JSONObject> followUpRecordList = kuaishouPromoterMapper.getFollowUpRecordListByPromoterId(promoter.getPromoterId(), followUpRecordId);
|
|
|
data.put("historyFollowUpRecord", followUpRecordList);
|
|
|
//标签
|
|
|
List<JSONObject> promoterLabelList = kuaishouPromoterMapper.getPromoterLabel(promoter.getPromoterId(), promoter.getUserId());
|