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 15ba33d..f5170ab 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
@@ -531,9 +531,6 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){
             wrapper.and(x->x.eq(ESJobDocument::getCode,esJobSearch.getCode()));
         }
-        if(!StringUtil.isEmptyOrNull(esJobSearch.getType())){
-            wrapper.and(x->x.eq(ESJobDocument::getType,esJobSearch.getType()));
-        }
         if(esJobSearch.getJobId()!=null){
             wrapper.and(x->x.eq(ESJobDocument::getJobId,esJobSearch.getJobId()));
         }
@@ -620,6 +617,24 @@ public class ESJobSearchImpl implements IESJobSearchService
         if(!StringUtil.isEmptyOrNull(jobQuery.getType())){
             wrapper.and(a->a.eq(ESJobDocument::getType,jobQuery.getType()));
         }
+        if(!StringUtil.isEmptyOrNull(jobQuery.getJobType())){
+            wrapper.and(a->a.eq(ESJobDocument::getJobType,jobQuery.getJobType()));
+        }
+        if(!StringUtil.isEmptyOrNull(jobQuery.getDescription())){
+            wrapper.and(x->x.like(ESJobDocument::getDescription,jobQuery.getDescription()));
+        }
+        if(!StringUtil.isEmptyOrNull(jobQuery.getCode())){
+            wrapper.and(x->x.eq(ESJobDocument::getCode,jobQuery.getCode()));
+        }
+        if(jobQuery.getJobId()!=null){
+            wrapper.and(x->x.eq(ESJobDocument::getJobId,jobQuery.getJobId()));
+        }
+        if(!StringUtil.isEmptyOrNull(jobQuery.getJobAddress())){
+            wrapper.and(x->x.like(ESJobDocument::getJobAddress,jobQuery.getJobAddress()));
+        }
+        if(!StringUtil.isEmptyOrNull(jobQuery.getJobLocation())){
+            wrapper.and(x->x.like(ESJobDocument::getJobLocation,jobQuery.getJobLocation()));
+        }
         if(Objects.nonNull(jobQuery.getOrder())){
             if (jobQuery.getOrder()==2){
                 wrapper.orderByDesc(ESJobDocument::getPostingDate);