|
@@ -201,7 +201,10 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
account.setRechargeId(recharge.getId());
|
|
account.setRechargeId(recharge.getId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
account.setProjectId(recharge.getProjectId());
|
|
account.setAccountId(obj.getLong("accountId"));
|
|
account.setAccountId(obj.getLong("accountId"));
|
|
- account.setAccountName(userAllocationService.getByAccountId(obj.getLong("accountId")).getAuthName());
|
|
|
|
|
|
+ UserAllocation acco = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
|
|
+ if (!Check.isNull(acco)) {
|
|
|
|
+ account.setAccountName(acco.getAuthName());
|
|
|
|
+ }
|
|
account.setCashAmount(obj.getBigDecimal("cashAmount"));
|
|
account.setCashAmount(obj.getBigDecimal("cashAmount"));
|
|
account.setReceivedAmount(obj.getBigDecimal("receivedAmount"));
|
|
account.setReceivedAmount(obj.getBigDecimal("receivedAmount"));
|
|
account.setRebateType(obj.getString("rebateType"));
|
|
account.setRebateType(obj.getString("rebateType"));
|