diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java
index 90e4e607..8b48cb70 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BsAssignServiceImpl.java
@@ -124,6 +124,7 @@ public class BsAssignServiceImpl extends BaseServiceImpl<BsAssignMapper, BsAssig
 
 		// 按工艺能力分组
 		Map<Long, List<BsAssignEntity>> existingGroupByCraft = allExisting.stream()
+				.filter(e -> e.getCraftAbilityId() != null)
 				.collect(Collectors.groupingBy(BsAssignEntity::getCraftAbilityId));
 
 		for (BsAssignEntity entity : entities) {