diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/CommonConfigController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/CommonConfigController.java
index 268b93333..6faa0bf5a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/CommonConfigController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/CommonConfigController.java
@@ -1,32 +1,31 @@
 package cn.iocoder.yudao.module.system.controller.admin.config;
 
-import cn.iocoder.yudao.module.system.controller.admin.config.vo.*;
-import cn.iocoder.yudao.module.system.dal.dataobject.config.CommonConfigDO;
-import cn.iocoder.yudao.module.system.service.config.CommonConfigService;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Operation;
-
-import javax.validation.constraints.*;
-import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.config.CommonConfigDO;
+import cn.iocoder.yudao.module.system.service.config.CommonConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 
 @Tag(name = "管理后台 - 通用配置")
@@ -92,4 +91,4 @@ public class CommonConfigController {
                         BeanUtils.toBean(list, CommonConfigRespVO.class));
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/vo/WareHouseLocationSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/vo/WareHouseLocationSaveReqVO.java
index ea118352c..a260029c9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/vo/WareHouseLocationSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/houselocation/vo/WareHouseLocationSaveReqVO.java
@@ -1,10 +1,8 @@
 package cn.iocoder.yudao.module.system.controller.admin.houselocation.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
+import lombok.Data;
+
 import java.math.BigDecimal;
 
 @Schema(description = "管理后台 - 库位新增/修改 Request VO")
@@ -103,4 +101,4 @@ public class WareHouseLocationSaveReqVO {
 
     @Schema(description = "ware_position_map的id", example = "1")
     private Long mapId;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationSaveReqVO.java
index ce06ce384..2f3bad512 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationSaveReqVO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationSaveReqVO.java
@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.robot.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import java.util.Set;
 import javax.validation.constraints.NotNull;
+import java.util.Set;
 
 @Schema(description = "管理后台 - 车辆信息新增/修改 Request VO")
 @Data
@@ -51,4 +50,4 @@ public class RobotInformationSaveReqVO {
 
     @Schema(description = "robot_task_detail的id")
     private Long taskDetailId;
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigService.java
index 8172c47d9..7918c99e5 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigService.java
@@ -1,12 +1,12 @@
 package cn.iocoder.yudao.module.system.service.config;
 
-import java.util.*;
-import javax.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.module.system.controller.admin.config.vo.*;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.config.CommonConfigDO;
 
+import javax.validation.Valid;
+
 /**
  * 通用配置 Service 接口
  *
@@ -52,4 +52,4 @@ public interface CommonConfigService {
      */
     PageResult<CommonConfigDO> getConfigPage(CommonConfigPageReqVO pageReqVO);
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigServiceImpl.java
index 6b0531165..f8bc93c30 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/CommonConfigServiceImpl.java
@@ -1,14 +1,16 @@
 package cn.iocoder.yudao.module.system.service.config;
 
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
-import cn.iocoder.yudao.module.system.controller.admin.config.vo.*;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.config.vo.CommonConfigVO;
 import cn.iocoder.yudao.module.system.controller.admin.log.vo.UserOperationLogSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.config.CommonConfigDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.robot.RobotTaskDetailDO;
 import cn.iocoder.yudao.module.system.dal.mysql.config.CommonConfigMapper;
 import cn.iocoder.yudao.module.system.enums.common.ZeroOneEnum;
 import cn.iocoder.yudao.module.system.enums.config.CommandConfigTypeEnum;
@@ -17,20 +19,11 @@ import cn.iocoder.yudao.module.system.service.tool.ToolsService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.CONFIG_NOT_EXISTS;
@@ -174,4 +167,4 @@ public class CommonConfigServiceImpl implements CommonConfigService {
         return configMapper.selectPage(pageReqVO);
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java
index aff9fe267..79f3cfdb9 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/housearea/HouseAreaServiceImpl.java
@@ -113,12 +113,12 @@ public class HouseAreaServiceImpl extends ServiceImpl<HouseAreaMapper, HouseArea
                         .setAreaId(createReqVO.getId())
                         .setType(NodeTypeEnum.WARE.getType()));
 
-        //2.查询目前的点位列表 - 如果没有的话 - 就设为空列表先 -
-        List<PositionMapItemDO> list = CollUtil.isEmpty(createReqVO.getMapItemIds()) ? Collections.emptyList() :
-                positionMapItemService.getByCondition(new PositionMapConditionDTO()
+        //2.查询目前的地图所有的库位点位列表 - 如果没有的话 - 就设为空列表先 -
+        List<PositionMapItemDO> list = positionMapItemService.getByCondition(new PositionMapConditionDTO()
                         .setPositionMapId(createReqVO.getPositionMapId())
                         .setType(NodeTypeEnum.WARE.getType())
-                        .setIds(createReqVO.getMapItemIds()));
+                        .setIds(createReqVO.getMapItemIds())
+                        .setAreaId(createReqVO.getId()));
 
         //3.判定当前这些点位是否已经有包含线库了 -
         List<PositionMapItemDO> containList = list.stream().filter(a -> a.getAreaId() != null && !a.getAreaId().equals(createReqVO.getId())).collect(Collectors.toList());
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java
index 24a108ad5..52a3fdd6e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/houselane/WareHouseLaneServiceImpl.java
@@ -88,9 +88,9 @@ public class WareHouseLaneServiceImpl extends ServiceImpl<WareHouseLaneMapper, W
                         .setType(NodeTypeEnum.WARE.getType()));
 
         //2.查询目前的点位列表 - 如果没有的话 - 就设为空列表先 -
-        List<PositionMapItemDO> list = CollUtil.isEmpty(createReqVO.getMapItemIds()) ? Collections.emptyList() :
-                positionMapItemService.getByCondition(new PositionMapConditionDTO()
+        List<PositionMapItemDO> list = positionMapItemService.getByCondition(new PositionMapConditionDTO()
                         .setPositionMapId(createReqVO.getPositionMapId())
+                        .setLaneId(createReqVO.getId())
                         .setType(NodeTypeEnum.WARE.getType())
                         .setIds(createReqVO.getMapItemIds()));