|
|
|
@ -4119,20 +4119,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
|
|
|
|
|
}
|
|
|
|
|
PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
|
|
|
|
|
new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
|
|
|
|
|
logs.forEach(log -> log.put("padding", log.getBooleanValue("editable")));
|
|
|
|
|
JSONObject result = PageListUtils.buildPageListResult(logs);
|
|
|
|
|
if (query.getPage() == 1) {
|
|
|
|
|
if (!logs.isEmpty()) {
|
|
|
|
|
JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clear_detail_id"));
|
|
|
|
|
if (clearingDetail != null) {
|
|
|
|
|
JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id"));
|
|
|
|
|
if (clearingLog.getBooleanValue("editable")) {
|
|
|
|
|
result.put("padding", true);
|
|
|
|
|
logs.get(0).put("padding", true);
|
|
|
|
|
logger.info("##editable{}", clearingLog.getBooleanValue("editable"));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
result.put("padding", logs.stream().anyMatch(log->log.getBooleanValue("editable")));
|
|
|
|
|
logger.info("##editable{}", result.getBooleanValue("padding"));
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|