diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
index b69e076..e40ad7f 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/location/service/impl/LocationServiceImpl.java
@@ -571,7 +571,7 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
     @Override
     public PageUtil<CompareLocationTaskDto> compareWcsLocationTask(QueryCompareLocationTaskDto queryCompareLocationTaskDto) {
         List<CompareLocationTaskDto> finalCompareLocationTaskList = new ArrayList<CompareLocationTaskDto>();
-        if (StringUtils.isEmpty(queryCompareLocationTaskDto.getLocationCode())) {
+        if (queryCompareLocationTaskDto.getLocationCode() == null) {
             return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
         }
         // 只查询近180天的数据
@@ -591,14 +591,19 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
             taskHeaderLambdaQueryWrapper.and(t -> t.eq(TaskHeader::getFromLocationCode, queryCompareLocationTaskDto.getLocationCode()).or()
                 .eq(TaskHeader::getToLocationCode, queryCompareLocationTaskDto.getLocationCode()));
         }
+        LambdaQueryWrapper<Location> locationLambdaQueryWrapper = Wrappers.lambdaQuery();
+        locationLambdaQueryWrapper.eq(Location::getCode, queryCompareLocationTaskDto.getLocationCode());
+        Location location = locationService.getOne(locationLambdaQueryWrapper);
+        if (location == null) {
+            return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
+        }
         List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
         if (CollectionUtils.isEmpty(taskHeaderList)) {
             return PageUtil.create(finalCompareLocationTaskList, queryCompareLocationTaskDto.getPageNo(), queryCompareLocationTaskDto.getPageSize());
         }
         // 2.获取WCS任务信息
         Map<Integer, List<WcsTaskDto>> wcsTaskMap = new HashMap<Integer, List<WcsTaskDto>>();
-        String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TAKS_INFOS, queryCompareLocationTaskDto.getWarehouseCode(),
-            taskHeaderList.get(0).getZoneCode());
+        String url = addressService.getUrlByParam(QuantityConstant.ADDRESS_WCS_TAKS_INFOS, queryCompareLocationTaskDto.getWarehouseCode(), location.getZoneCode());
         Map<String, Object> queryParamMap = new HashMap<String, Object>();
         if (StringUtils.isNotEmpty(queryCompareLocationTaskDto.getWarehouseCode())) {
             queryParamMap.put("warehouseCode", queryCompareLocationTaskDto.getWarehouseCode());