修改门店地区取值

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -658,13 +658,13 @@ public class StoreApiServiceImpl implements StoreApiService {
             List<CountyDTO> countyDTOList = countyResponse.getResult();
             String finalCounty = processBatchStoreDTO.getCounty();
             CountyDTO countyDTO = countyDTOList.stream().filter(e -> StringUtils.equals(e.getCountyName(), finalCounty)).findFirst().orElse(null);
-            if (countyDTO == null ||cityDTO == null || provinceDTO == null) {
-                return responseErrorElement(ImportStoreBatchResultEnum.B4);
+            if (provinceDTO != null && cityDTO != null && countyDTO != null) {
+                storeDTO.setProvinceId(countyDTO.getProvinceId());
+                storeDTO.setCityId(countyDTO.getCityId());
+                storeDTO.setAreaId(countyDTO.getCountyId());
+                storeDTO.setProvinces(provinceDTO.getProvinceName() + "/" + countyDTO.getCountyName() + "/" + cityDTO.getCityName());
             }
-            storeDTO.setProvinceId(countyDTO.getProvinceId());
-            storeDTO.setCityId(countyDTO.getCityId());
-            storeDTO.setAreaId(countyDTO.getCountyId());
-            storeDTO.setProvinces(provinceDTO.getProvinceName() + "/" + countyDTO.getCountyName() + "/" + cityDTO.getCityName());
+
         }
 
         List<StoreFieldDTO> fieldList = storeFieldService.listStoreFieldByRegionId(processBatchStoreDTO.getRegionId());