销售合同pdf

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

@@ -24,7 +24,6 @@ import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.contract.vo.ContractDocumentaryVo;
 import com.fjhx.sale.entity.contract.vo.ContractPdfInfoVo;
-import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.mapper.contract.ContractMapper;
 import com.fjhx.sale.service.contract.ContractProductService;
@@ -310,18 +309,15 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     private void setArea(ContractPdfInfoVo contractPdfInfoVo, Contract contract) {
 
         List<String> areaIdList = Arrays.asList(
-                contract.getSellCountryId(),
-                contract.getSellProvinceId(),
-                contract.getSellCityId(),
                 contract.getBuyCountryId(),
                 contract.getBuyProvinceId(),
                 contract.getBuyCityId()
         );
 
         Map<String, String> areaMap = AreaUtil.getAreaMapByIds(areaIdList);
-        contractPdfInfoVo.setSellCountryName(areaMap.get(contract.getSellCountryId()));
-        contractPdfInfoVo.setSellProvinceName(areaMap.get(contract.getSellProvinceId()));
-        contractPdfInfoVo.setSellCityName(areaMap.get(contract.getSellCityId()));
+        contractPdfInfoVo.setSellCountryName(contract.getSellCountryId());
+        contractPdfInfoVo.setSellProvinceName(contract.getSellProvinceId());
+        contractPdfInfoVo.setSellCityName(contract.getSellCityId());
         contractPdfInfoVo.setSellDetailedAddress(contract.getSellAddress());
         contractPdfInfoVo.setBuyCountryName(areaMap.get(contract.getBuyCountryId()));
         contractPdfInfoVo.setBuyProvinceName(areaMap.get(contract.getBuyProvinceId()));