|
@@ -1289,17 +1289,17 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
|
|
|
if (ObjectUtil.isNotEmpty(corporation)) {
|
|
|
result.setSellCorporationName(corporation.getName());
|
|
|
}
|
|
|
+
|
|
|
|
|
|
Customer customer = customerService.getById(result.getBuyCorporationId());
|
|
|
- if (ObjectUtil.isNotEmpty(corporation)) {
|
|
|
- result.setSellCorporationName(corporation.getName());
|
|
|
+ if (ObjectUtil.isNotEmpty(customer)) {
|
|
|
result.setBuyCorporationName(customer.getName());
|
|
|
-
|
|
|
|
|
|
result.setPaymentAccountName(customer.getAccountName());
|
|
|
result.setPaymentAccountBank(customer.getAccountBank());
|
|
|
result.setPaymentAccountNumber(customer.getAccountNumber());
|
|
|
}
|
|
|
+
|
|
|
|
|
|
AccountManagement accountManagement = accountManagementService.getById(result.getShroffAccountId());
|
|
|
if (ObjectUtil.isNotEmpty(accountManagement)) {
|