소스 검색

供应链2。2

zhaoxian 2 년 전
부모
커밋
10e92f8f70
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouPromoterServiceImpl.java

+ 5 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouPromoterServiceImpl.java

@@ -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());