From bcca13f39650e5e42bde70adf11e5081208c9f20 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Wed, 17 Jun 2026 00:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=BC=81=E4=B8=9A=E5=92=8C=E5=B2=97=E4=BD=8D=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=98=AF=E4=BC=81=E4=B8=9A=E5=88=99=EF=BC=8C=E7=A4=BE?=
 =?UTF-8?q?=E4=BC=9A=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=88=99=E8=BF=94=E5=9B=9E=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/cms/controller/cms/CmsJobController.java   | 3 +++
 .../java/com/ruoyi/cms/controller/cms/CompanyController.java  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java
index f4243a8..05d987d 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java
@@ -88,6 +88,9 @@ public class CmsJobController extends BaseController
     {
         if (RoleUtils.isCompanyAdmin()) {
             Company company = companyService.queryCodeCompany(RoleUtils.getCurrentUseridCard());
+            if(company==null){
+                return getDataTable(new ArrayList<>());
+            }
             job.setCompanyId(Objects.nonNull(company) ? company.getCompanyId() : null);
         }
         startPage();
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java
index af8675f..84e2bfb 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyController.java
@@ -24,6 +24,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -54,6 +55,9 @@ public class CompanyController extends BaseController
     {
         if (RoleUtils.isCompanyAdmin()) {
             System.out.println("企业社会信用代码============================="+RoleUtils.getCurrentUseridCard());
+            if(company==null){
+                return getDataTable(new ArrayList<>());
+            }
             company.setCode(RoleUtils.getCurrentUseridCard());
         }
         startPage();