diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
index 6d32c3cb9..2c9e422a6 100644
--- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
@@ -295,6 +295,14 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         // 4. 当前公司下的机构数量
         Long userId = LoginContext.me().getLoginUser().getUserId();
         UserOrgDTO userMainOrgInfo = sysUserOrgService.getUserMainOrgInfo(userId);
+
+        // 当前用户没公司，则直接设置为0
+        if (userMainOrgInfo == null) {
+            homeCompanyInfo.setCurrentCompanyPersonNum(0L);
+            homeCompanyInfo.setCurrentCompanyPersonNum(0L);
+            return homeCompanyInfo;
+        }
+
         Long companyId = userMainOrgInfo.getCompanyId();
 
         // 获取当前公司的所有子公司数量(含当前公司)
diff --git a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
index b10c87949..82859bd4d 100644
--- a/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
+++ b/kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
@@ -140,6 +140,12 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
         queryWrapper.eq(SysUserOrg::getUserId, userId);
         queryWrapper.eq(SysUserOrg::getMainFlag, YesOrNotEnum.Y.getCode());
         List<SysUserOrg> sysUserOrgList = this.list(queryWrapper);
+
+        // 部门为空，直接返回null
+        if (ObjectUtil.isEmpty(sysUserOrgList)) {
+            return null;
+        }
+
         if (sysUserOrgList.size() > 1) {
             throw new SysException(MAIN_FLAG_COUNT_ERROR, userId);
         }