From ed11705dfa1999e8b6070bec056095a045e4d90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Wed, 22 Apr 2026 15:18:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=B4=BE=E8=A7=84=E5=88=99=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/desk/basic/service/impl/BsAssignServiceImpl.java | 1 +
 1 file changed, 1 insertion(+)

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) {