Merge branch 'test' into dev

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsServiceImpl.java

@@ -420,12 +420,12 @@ public class DocumentsServiceImpl extends ServiceImpl<DocumentsMapper, Documents
                 contractVo.getSellCityId()
         );
         Map<Long, String> areaMap = CustomizeAreaUtil.getAreaMapByIds(areaIdList);
-        contractVo.setBuyCountryName(areaMap.get(contractVo.getBuyCountryId()));
-        contractVo.setBuyProvinceName(areaMap.get(contractVo.getBuyProvinceId()));
-        contractVo.setBuyCityName(areaMap.get(contractVo.getBuyCityId()));
-        contractVo.setSellCountryName(areaMap.get(contractVo.getSellCountryId()));
-        contractVo.setSellProvinceName(areaMap.get(contractVo.getSellProvinceId()));
-        contractVo.setSellCityName(areaMap.get(contractVo.getSellCityId()));
+        contractVo.setBuyCountryName(areaMap.getOrDefault(contractVo.getBuyCountryId(),contractVo.getBuyCountryName()));
+        contractVo.setBuyProvinceName(areaMap.getOrDefault(contractVo.getBuyProvinceId(),contractVo.getBuyProvinceName()));
+        contractVo.setBuyCityName(areaMap.getOrDefault(contractVo.getBuyCityId(),contractVo.getBuyCityName()));
+        contractVo.setSellCountryName(areaMap.getOrDefault(contractVo.getSellCountryId(),contractVo.getSellCountryName()));
+        contractVo.setSellProvinceName(areaMap.getOrDefault(contractVo.getSellProvinceId(),contractVo.getSellProvinceName()));
+        contractVo.setSellCityName(areaMap.getOrDefault(contractVo.getSellCityId(),contractVo.getSellCityName()));
     }
 
     /**