Merge remote-tracking branch 'origin/dev' into dev

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.account.controller.utils.DateUtils;
-import com.fjhx.account.entity.account.po.AccountManagement;
 import com.fjhx.account.entity.account.vo.AccountRequestFundsDetailVo;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.service.account.AccountManagementService;
@@ -1333,18 +1332,25 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     }
 
     private void setAccountManagement(ContractPdfInfoVo contractPdfInfoVo, Contract contract) {
-        Long shroffAccountId = contract.getShroffAccountId();
-        AccountManagement accountManagement = accountManagementService.getById(shroffAccountId);
-        if (accountManagement == null) {
-            return;
-        }
-
-        contractPdfInfoVo.setBeneficiaryName(accountManagement.getBeneficiaryName());
-        contractPdfInfoVo.setBeneficiaryBank(accountManagement.getBeneficiaryBank());
-        contractPdfInfoVo.setBeneficiaryBankAddress(accountManagement.getBeneficiaryBankAddress());
-        contractPdfInfoVo.setBeneficiaryAccountNumber(accountManagement.getBeneficiaryAccountNumber());
-        contractPdfInfoVo.setSwiftCode(accountManagement.getSwiftCode());
-        contractPdfInfoVo.setBeneficiaryAddress(accountManagement.getBeneficiaryAddress());
+//        Long shroffAccountId = contract.getShroffAccountId();
+//        AccountManagement accountManagement = accountManagementService.getById(shroffAccountId);
+//        if (accountManagement == null) {
+//            return;
+//        }
+//
+//        contractPdfInfoVo.setBeneficiaryName(accountManagement.getBeneficiaryName());
+//        contractPdfInfoVo.setBeneficiaryBank(accountManagement.getBeneficiaryBank());
+//        contractPdfInfoVo.setBeneficiaryBankAddress(accountManagement.getBeneficiaryBankAddress());
+//        contractPdfInfoVo.setBeneficiaryAccountNumber(accountManagement.getBeneficiaryAccountNumber());
+//        contractPdfInfoVo.setSwiftCode(accountManagement.getSwiftCode());
+//        contractPdfInfoVo.setBeneficiaryAddress(accountManagement.getBeneficiaryAddress());
+
+        contractPdfInfoVo.setBeneficiaryName(contract.getBeneficiaryName());
+        contractPdfInfoVo.setBeneficiaryBank(contract.getBeneficiaryBank());
+        contractPdfInfoVo.setBeneficiaryBankAddress(contract.getBeneficiaryBankAddress());
+        contractPdfInfoVo.setBeneficiaryAccountNumber(contract.getBeneficiaryAccountNumber());
+        contractPdfInfoVo.setSwiftCode(contract.getSwiftCode());
+        contractPdfInfoVo.setBeneficiaryAddress(contract.getBeneficiaryAddress());
     }
 
     // 添加时间的查询条件