diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
index 3af305e..7d8cff3 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/ESJobDocument.java
@@ -2,7 +2,6 @@ package com.ruoyi.cms.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.cms.domain.vo.CompanyVo;
 import com.ruoyi.common.core.domain.entity.Company;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -151,7 +150,7 @@ public class ESJobDocument
     @ApiModelProperty("信用代码")
     private String code;
 
-    /*@ApiModelProperty("公司信息")
-    @IndexField(fieldType = FieldType.OBJECT)
-    private CompanyVo companyVo;*/
+    @ApiModelProperty("公司信息")
+    @IndexField(fieldType = FieldType.TEXT)
+    private String companyVoJson;
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
index d8f04ce..bad7149 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
@@ -1,5 +1,7 @@
 package com.ruoyi.cms.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.ruoyi.cms.domain.vo.CompanyVo;
 import com.ruoyi.cms.service.ICompanyService;
 import com.ruoyi.common.core.domain.entity.AppUser;
 import com.ruoyi.cms.domain.ESJobDocument;
@@ -100,6 +102,8 @@ public class ESJobSearchImpl implements IESJobSearchService
                 for (Job job : jobList) {
                     ESJobDocument esJobDocument = new ESJobDocument();
                     BeanUtils.copyBeanProp(esJobDocument, job);
+                    CompanyVo vo=job.getCompanyVo();
+                    esJobDocument.setCompanyVoJson(JSON.toJSONString(vo));
                     esJobDocument.setAppJobUrl("https://qd.zhaopinzao8dian.com/app#/packageA/pages/post/post?jobId="+ Base64.getEncoder().encodeToString(String.valueOf(job.getJobId()).getBytes()));
                     if(!StringUtil.isEmptyOrNull(job.getScale())){
                         esJobDocument.setScale(Integer.valueOf(job.getScale()));
@@ -427,6 +431,9 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){
             wrapper.and(x->x.eq(ESJobDocument::getCode,esJobSearch.getCode()));
         }
+        if(esJobSearch.getJobId()!=null){
+            wrapper.and(x->x.eq(ESJobDocument::getJobId,esJobSearch.getJobId()));
+        }
         if(Objects.nonNull(esJobSearch.getOrder())){
             if(esJobSearch.getOrder()==1){
                 wrapper.orderByDesc(ESJobDocument::getIsHot);