diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
index eb4255eb..c01f1e18 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java
@@ -341,7 +341,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
                             teamSet = teamSetMapper.selectOne(new LambdaQueryWrapper<TeamSet>()
                                     .eq(TeamSet::getId, nextWorkPlan.getMakeTeam()));
                         }
-                        wp.setMakeTeam(teamSet.getId());
+                        wp.setMakeTeam(teamSet == null ? null : teamSet.getId());
                         wp.setOem(null);
                         wp.setPlanStartTime(null);
                         wp.setUnqualifiedQty(0d);