From 1753277b7c1591eea6a7f2e58a0f0829731c0342 Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Wed, 25 Mar 2026 17:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/system/service/impl/DeptServiceImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
index b6c711ba..3f88500e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
@@ -152,7 +152,9 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 
 			if(teamUnSelects != null && teamUnSelects.size() > 0){
-				noChooseMap = teamUnSelects.stream().collect(Collectors.groupingBy(User::getDeptId));
+				noChooseMap = teamUnSelects.stream()
+						.filter(user -> user.getDeptId() != null)
+						.collect(Collectors.groupingBy(User::getDeptId));
 			}
 			if(teamSelects != null && teamSelects.size() > 0){
 				chooseMap = teamSelects.stream().collect(Collectors.groupingBy(User::getDeptId));