Skip to content

C
cash-loan-flow-boss
Commit 851b33b5 authored by suntao's avatar suntao
Browse files
Options

空指针

parent 14788332
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/service/OptHistoryLogService.java
View file @ 851b33b5
...@@ -8,6 +8,7 @@ import cn.quantgroup.cashloanflowboss.spi.clf.entity.ApplyRequestHistory; ...@@ -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.ClfOrderMapping;
import cn.quantgroup.cashloanflowboss.spi.clf.entity.WithdrawRecord; import cn.quantgroup.cashloanflowboss.spi.clf.entity.WithdrawRecord;
import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService; import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -53,8 +54,12 @@ public class OptHistoryLogService { ...@@ -53,8 +54,12 @@ public class OptHistoryLogService {
// 转换 // 转换
List<OptHistoryLog> userOptHistoryLogList = OrderUtil.convertApplyRequestHistoryList2OptHistoryLogList(applyRequestHistoryList, orderMapping); List<OptHistoryLog> userOptHistoryLogList = OrderUtil.convertApplyRequestHistoryList2OptHistoryLogList(applyRequestHistoryList, orderMapping);
userOptHistoryLogList.addAll(optHistoryLogList); if (CollectionUtils.isNotEmpty(optHistoryLogList)) {
userOptHistoryLogList.addAll(withdrawOptHistoryLogList); userOptHistoryLogList.addAll(optHistoryLogList);
}
if (CollectionUtils.isNotEmpty(withdrawOptHistoryLogList)) {
userOptHistoryLogList.addAll(withdrawOptHistoryLogList);
}
userOptHistoryLogList.sort((o1, o2)->{ userOptHistoryLogList.sort((o1, o2)->{
if (o1.getCreateTime().getTime() < o2.getCreateTime().getTime()) { if (o1.getCreateTime().getTime() < o2.getCreateTime().getTime()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment