1.添加取消收藏方法

2.修改es查询报错问题

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));
+    }
 }

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

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())){
+            if(!StringUtil.isEmptyOrNull(appUser.getWorkExperience())){
-                newSearch.setExperience(appUser.getExperience());
+                newSearch.setExperience(appUser.getWorkExperience());
             }
             if(!StringUtil.isEmptyOrNull(esJobSearch.getExperience())){
                 newSearch.setExperience(esJobSearch.getExperience());

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) {
         // 查询岗位信息