From 83de70ab5045f06e71b3dde4fead735f6a24820b Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Sat, 1 Nov 2025 18:17:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E6=96=B9=E6=B3=95=202.=E4=BF=AE=E6=94=B9es=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/controller/cms/CmsJobController.java  | 22 +++++++++++++++++++
 .../cms/service/IJobCollectionService.java    |  2 ++
 .../cms/service/impl/ESJobSearchImpl.java     |  4 ++--
 .../impl/JobCollectionServiceImpl.java        |  9 ++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

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 6adab84..aac62b5 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
@@ -264,4 +264,26 @@ public class CmsJobController extends BaseController
         }
         return success(iAppReviewJobService.selectAppReviewJobListJob(appReviewJob));
     }
+
+    @PostMapping("/collectionCancel")
+    @ApiOperation("取消收藏")
+    public AjaxResult pcCancel(@RequestBody JobCollection jobCollection)
+    {
+        if(jobCollection.getJobId()==null){
+            return AjaxResult.error("岗位id为空");
+        }
+        if(!SecurityUtils.isLogin()){
+            return AjaxResult.error("用户未登录!");
+        }
+        if(jobCollection.getUserId()==null){
+            String idCard=RoleUtils.getCurrentUseridCard();
+            AppUser appUser=appUserService.selectAppuserByIdcard(idCard);
+            if(appUser==null){
+                return AjaxResult.error("用户信息未完善,请完善身份证信息!");
+            }else{
+                jobCollection.setUserId(appUser.getUserId());
+            }
+        }
+        return toAjax(jobCollectionService.pcCancel(jobCollection));
+    }
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java
index fc289b0..400ae40 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobCollectionService.java
@@ -81,4 +81,6 @@ public interface IJobCollectionService
     int pcJobCollection(JobCollection collection);
 
     public List<Job> selectJobCollectionListJob(JobCollection jobCollection);
+
+    int pcCancel(JobCollection collection);
 }
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 bad7149..279ec1e 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
@@ -622,8 +622,8 @@ public class ESJobSearchImpl implements IESJobSearchService
             if(!StringUtil.isEmptyOrNull(appUser.getArea())){
                 newSearch.setArea(appUser.getArea());
             }
-            if(!StringUtil.isEmptyOrNull(appUser.getExperience())){
-                newSearch.setExperience(appUser.getExperience());
+            if(!StringUtil.isEmptyOrNull(appUser.getWorkExperience())){
+                newSearch.setExperience(appUser.getWorkExperience());
             }
             if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){
                 newSearch.setExperience(esJobSearch.getExperience());
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java
index cdd138c..d6cd440 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobCollectionServiceImpl.java
@@ -168,6 +168,15 @@ public class JobCollectionServiceImpl extends ServiceImpl<JobCollectionMapper,Jo
         return 1;
     }
 
+    @Override
+    public int pcCancel(JobCollection collection) {
+        List<JobCollection> jobCollections = jobCollectionMapper.selectList(Wrappers.<JobCollection>lambdaQuery().eq(JobCollection::getJobId, collection.getJobId()).eq(JobCollection::getUserId, collection.getUserId()));
+        if(jobCollections.size()>0){
+            jobCollectionMapper.deleteBatchIds(jobCollections.stream().map(JobCollection::getId).collect(Collectors.toList()));
+        }
+        return 1;
+    }
+
     @Override
     public CompetitivenessResponse competitiveness(Long jobId) {
         // 查询岗位信息