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 821ffb1..ba17bcf 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 @@ -1,9 +1,11 @@ package com.ruoyi.cms.controller.cms; +import com.alibaba.fastjson.JSON; import com.ruoyi.cms.domain.ESJobDocument; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.query.ESJobSearch; import com.ruoyi.cms.domain.vo.CandidateVO; +import com.ruoyi.cms.domain.vo.CompanyVo; import com.ruoyi.cms.service.ICompanyService; import com.ruoyi.cms.service.IJobService; import com.ruoyi.cms.util.RoleUtils; @@ -16,6 +18,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.Company; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -24,6 +27,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -147,7 +151,6 @@ public class CmsJobController extends BaseController } @ApiOperation("获取推荐岗位") -// @PreAuthorize("@ss.hasPermi('bussiness:job:recommend')") @GetMapping("/recommend") public AjaxResult recommend(ESJobSearch esJobSearch) { @@ -157,7 +160,14 @@ public class CmsJobController extends BaseController } esJobSearch.setPageSize(20); List jobList = jobService.sysRecommend(esJobSearch); - return success(jobList); + List jobs=new ArrayList<>(); + jobList.stream().forEach(it->{ + Job job=new Job(); + BeanUtils.copyBeanProp(job, it); + job.setCompanyVo(JSON.parseObject(it.getCompanyVoJson(), CompanyVo.class)); + jobs.add(job); + }); + return success(jobs); } @ApiOperation("获取所有岗位")