[合同][修改][下载]

mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

@@ -723,8 +723,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
         result.put("operationArea", wxShop.get("operationArea"));
         //商户信息
         WxMerchant merchant = wxMerchantService.getById(wxRentContract.getMerchantId());
-        result.put("merchantName",merchant.getName());
         if (merchant!=null) {
+            result.put("merchantName",merchant.getName());
             //法人信息
             WxMerchantCorp wxMerchantCorp = merchant.getWxMerchantCorp();
             result.put("corpPapersNumber", StringUtils.isNotEmpty(wxMerchantCorp.getCorpPapersNumber()) ? wxMerchantCorp.getCorpPapersNumber() : " ");
@@ -737,6 +737,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
             result.put("bankAccount", StringUtils.isNotEmpty(wxMerchantTax.getBankAccount()) ? wxMerchantTax.getBankAccount() : " ");
             result.put("invoiceAddressPhone", StringUtils.isNotEmpty(wxMerchantTax.getInvoiceAddressPhone()) ? wxMerchantTax.getInvoiceAddressPhone() : " ");
         } else {
+            result.put("merchantName","");
             //法人信息
             result.put("corpPapersNumber", " ");
             result.put("corpPapersType", " ");