|
|
@@ -201,8 +201,12 @@ public class AccountApiController extends AbstractApiController {
|
|
|
}
|
|
|
c.setOrderByClause("create_time desc");
|
|
|
List<AccountFlow> flows = accountFlowService.findByCondition(c);
|
|
|
+ // 根据bizId和type相同的数据去重
|
|
|
List<AccountFlow> distinctFlows = flows.stream()
|
|
|
- .collect(Collectors.toMap(AccountFlow::getId, Function.identity(), (existing, replacement) -> existing))
|
|
|
+ .collect(Collectors.toMap(
|
|
|
+ flow -> flow.getBizId() + "_" + flow.getType(),
|
|
|
+ Function.identity(),
|
|
|
+ (existing, replacement) -> existing))
|
|
|
.values().stream()
|
|
|
.sorted((af1, af2) -> af2.getCreateTime().compareTo(af1.getCreateTime()))
|
|
|
.collect(Collectors.toList());
|