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();