diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java
index 86cb854..9853bc4 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java
@@ -88,7 +88,7 @@ public class DepartmentService extends BaseReactiveServiceImpl<Department> {
         if (query instanceof DepartmentQo) {
             DepartmentQo qo = (DepartmentQo) query;
             // 如果是非管理员
-            if (qo.getUser().getType() != UserType.SUPER_ADMIN) {
+            if (null != qo.getUser() && qo.getUser().getType() != UserType.SUPER_ADMIN) {
                 // 占位，包装查询实体
                 Mono<Qo<Department>> mono = Mono.just(qo);
                 // 使用列表内的部门作为条件
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java
index 6b74504..e8c0675 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/service/RoleService.java
@@ -85,7 +85,7 @@ public class RoleService extends BaseReactiveServiceImpl<Role> {
         // 基于创建者进行筛选
         if (query instanceof RoleQo) {
             IUser user = query.getUser();
-            if (user.getType() != UserType.SUPER_ADMIN) {
+            if (null != user && user.getType() != UserType.SUPER_ADMIN) {
                 return getOwnedIds(user)
                         .flatMapMany(ids -> {
                             RoleQo qo = (RoleQo) query;