From 646255c8f70b8144440a9067d713a3678502c3b7 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 19 Jul 2023 17:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90sys=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?null=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/org/service/impl/HrOrganizationServiceImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
index eb695299d..dec7ed38d 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
@@ -191,6 +191,9 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
         // 将每个机构的公司名称返回
         for (HrOrganization hrOrganization : sysRolePage.getRecords()) {
             CompanyDeptDTO companyInfo = this.getOrgCompanyInfo(hrOrganization);
+            if (companyInfo == null) {
+                continue;
+            }
             hrOrganization.setCompanyName(companyInfo.getCompanyName());
         }