空指针

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/service/OptHistoryLogService.java

@@ -8,6 +8,7 @@ import cn.quantgroup.cashloanflowboss.spi.clf.entity.ApplyRequestHistory;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.WithdrawRecord;
 import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,8 +54,12 @@ public class OptHistoryLogService {
 
         // 转换
         List<OptHistoryLog> userOptHistoryLogList = OrderUtil.convertApplyRequestHistoryList2OptHistoryLogList(applyRequestHistoryList, orderMapping);
-        userOptHistoryLogList.addAll(optHistoryLogList);
-        userOptHistoryLogList.addAll(withdrawOptHistoryLogList);
+        if (CollectionUtils.isNotEmpty(optHistoryLogList)) {
+            userOptHistoryLogList.addAll(optHistoryLogList);
+        }
+        if (CollectionUtils.isNotEmpty(withdrawOptHistoryLogList)) {
+            userOptHistoryLogList.addAll(withdrawOptHistoryLogList);
+        }
 
         userOptHistoryLogList.sort((o1, o2)->{
             if (o1.getCreateTime().getTime() < o2.getCreateTime().getTime()) {