diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
index c2ba8ce7b..f60aee6c5 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/assemblylist/AssemblyListServiceImpl.java
@@ -79,7 +79,9 @@ public class AssemblyListServiceImpl implements AssemblyListService {
         }
 
         // 查询入参部件
-        List<OrderComponentDO> componentDOS = orderComponentMapper.selectByIds(componentIds);
+        List<OrderComponentDO> componentDOS = orderComponentMapper.selectList(new LambdaUpdateWrapper<OrderComponentDO>()
+                .in(OrderComponentDO::getId, componentIds)
+                .in(OrderComponentDO::getOrderId, reqVO.getOrderIds()));
         if (CollUtil.isEmpty(componentDOS) || componentDOS.size() != componentIds.size()) {
             throw new ServiceException(ORDER_COMPONENT_NOT_EXIST);
         }
@@ -117,6 +119,9 @@ public class AssemblyListServiceImpl implements AssemblyListService {
         List<String> topComponentNames = orderComponentTreeRespVOS.stream().map(OrderComponentTreeCompareVO::getName).distinct().toList();
 
         // 根据名称查询组织装配设置
+        if (CollUtil.isEmpty(topComponentNames)) {
+            return orderComponentTreeRespVOS;
+        }
         CommonResult<List<AssemblyConfigRespDTO>> assemblyConfigByComponentNameListResult = assemblyConfigApi.getAssemblyConfigByPartNameList(topComponentNames);
         if(assemblyConfigByComponentNameListResult.isError()) {
             throw new ServiceException(ORDER_COMPONENT_ASSEMBLY_CONFIG_QUERY_ERROR);
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
index c45bad740..3e7663b88 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
@@ -1824,7 +1824,7 @@ public class WebCadOrderImportAsyncFactory {
                     reader.startArray();
                     while (reader.hasNext()) {
                         // 递归子节点
-                        processComponent(reader, componentId, topId, level); // 子节点在递归中生成组件DO
+                        processComponent(reader, componentId, topId, level + 1); // 子节点在递归中生成组件DO
                     }
                     reader.endArray();
                     break;
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
index 6f82c03aa..5d35175cb 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
@@ -579,9 +579,9 @@ public class WebCadOrderImportFactory {
         orderComponentDOS.add(componentDO);
         orderComponentBatchInsertWithinThreshold(orderComponentDOS, false);
         // 继续处理下级
-        if (!componentGroupReqVO.getChildren().isEmpty()) {
+        if (CollUtil.isNotEmpty(componentGroupReqVO.getChildren())) {
             for (WebCadDataComponentGroupReqVO children : componentGroupReqVO.getChildren()) {
-                createAndCacheComponent(children, componentId, topId, ++level);
+                createAndCacheComponent(children, componentId, topId, level + 1);
             }
         }
     }