czh 2 lat temu
rodzic
commit
7b9f96b687

+ 3 - 2
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -264,7 +264,7 @@ public class KwcContractTradeService {
 
                 if (kwcContractTradeUnit.getUnitType().compareTo(EntTypeEnum.PURCHASER.getCode()) == 0) {
                     tradeBaseInfoResVo.setPurchaseEntName(kwcContractTradeUnit.getFirmName());
-                    tradeBaseInfoResVo.setPurchasePhone(kwcContractTradeUnit.getPhone());
+                    tradeBaseInfoResVo.setPurchasePhone(kwcContractTradeUnit.getSignPhone());
                     tradeBaseInfoResVo.setPurchaseEntId(kwcContractTradeUnit.getEntId());
                 }
             }
@@ -309,7 +309,7 @@ public class KwcContractTradeService {
         List<String> fileList = new ArrayList<>();
         fileList.add(kwcContractTrade.getSigningUrl());
         fileList.add(kwcContractTrade.getSignedUrl());
-        contractTradeDetailResVo.setContractFile(fileList);
+        contractTradeDetailResVo.setContractFile(fileList.stream().filter(StringUtils::isNotBlank).toList());
 
         List<KwcContractTrade> supplementList = getSupplementList(id);
         if (CollectionUtils.isNotEmpty(supplementList)) {
@@ -319,6 +319,7 @@ public class KwcContractTradeService {
             }
             contractTradeDetailResVo.setChild(child);
         }
+        contractTradeDetailResVo.setRemark(kwcContractTrade.getRemark());
         return contractTradeDetailResVo;
     }