wanglang 2 hete%!(EXTRA string=óta)
szülő
commit
6c9456e7d5

+ 1 - 1
trade-client/src/main/java/com/trade/client/accounts/payableaccounts/service/impl/CPayableAccountsServiceImpl.java

@@ -105,7 +105,7 @@ public class CPayableAccountsServiceImpl implements CPayableAccountsService {
         PayableAccountsDetail payableAccountsDetail = new PayableAccountsDetail();
         BusinessRelateFile businessRelateFile = businessRelateFileBaseService.getByCondition(payableAccounts.getId(),
                 BillingConstant.PAYMENT_VOUCHER, FileTypeEnum.PAYABLE_ACCOUNTS.getCode());
-        if (businessRelateFile != null) {
+        if (businessRelateFile != null && businessRelateFile.getFileId() != null) {
             FileAbstractDto payableAccountsFile = new FileAbstractDto(
                     fileStorageService.getFileStorageById(businessRelateFile.getFileId()));
             payableAccountsDetail.setPayableAccountsFile(payableAccountsFile);

+ 2 - 0
trade-service/src/main/java/com/trade/service/finance/disbursement/dto/DisbursementSearchDto.java

@@ -22,6 +22,8 @@ public class DisbursementSearchDto extends PageDomain {
 
     @ApiModelProperty(name = "paymentType", value = "款项类型1出口退税款2贸易回款")
     private String paymentType;
+    @ApiModelProperty(name = "payeeType", value = "收款方类型")
+    private String payeeType;
     @ApiModelProperty(name = "financierIdentifier", value = "资金方标识")
     private String financierIdentifier;
     // @ApiModelProperty(name = "importerCertNo", value = "进口商统一社会信用代码/注册号")