From 0076eeeb484a783b6040feba11c470b0b0436b64 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Sat, 11 Oct 2025 15:20:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/cms/domain/ESJobDocument.java    | 3 +++
 .../java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java | 9 +++++++++
 2 files changed, 12 insertions(+)

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 5130122..4f777d6 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
@@ -139,4 +139,7 @@ public class ESJobDocument
 
     @ApiModelProperty("视频封面URL")
     private String cover;
+
+    @ApiModelProperty("岗位类型 0疆内 1疆外")
+    private String jobType;
 }
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 ac30330..b69b223 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
@@ -174,6 +174,9 @@ public class ESJobSearchImpl implements IESJobSearchService
             if(!StringUtil.isEmptyOrNull(appUser.getSalaryMin())){
                 newSearch.setMinSalary(Long.valueOf(appUser.getSalaryMin()));
             }
+            if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){
+                newSearch.setJobType(esJobSearch.getJobType());
+            }
         }
 
         LambdaEsQueryWrapper<ESJobDocument> wrapper = getWrapper(newSearch,jobIds);
@@ -395,6 +398,9 @@ public class ESJobSearchImpl implements IESJobSearchService
             List<Integer> integers = StringUtil.convertStringToIntegerList(esJobSearch.getArea());
             wrapper.and(x->x.in(ESJobDocument::getJobLocationAreaCode,integers));
         }
+        if(!StringUtil.isEmptyOrNull(esJobSearch.getJobType())){
+            wrapper.and(x->x.eq(ESJobDocument::getJobType,esJobSearch.getJobType()));
+        }
         if(Objects.nonNull(esJobSearch.getOrder())){
             if(esJobSearch.getOrder()==1){
                 wrapper.orderByDesc(ESJobDocument::getIsHot);
@@ -402,6 +408,9 @@ public class ESJobSearchImpl implements IESJobSearchService
             if(esJobSearch.getOrder()==2){
                 wrapper.orderByDesc(ESJobDocument::getPostingDate);
             }
+            if(esJobSearch.getOrder()==3){
+                wrapper.orderByDesc(ESJobDocument::getMaxSalary);
+            }
         }
         if(!ListUtil.isListEmptyOrNull(jobIds)){
             wrapper.not().in(ESJobDocument::getJobId, jobIds);