From 6104302de97f1b2cd1383b1df41713ba62d3da6c Mon Sep 17 00:00:00 2001 From: sh Date: Thu, 30 Oct 2025 18:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8D=95=E4=B8=AA=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=8F=E5=8E=86=E6=8E=A5=E5=8F=A3-/cms/userworkexpe?= =?UTF-8?q?riences/=20=E4=BF=AE=E6=94=B9=E5=8D=95=E4=B8=AA=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=8F=E5=8E=86=E6=8E=A5=E5=8F=A3-/cms/userworkexpe?= =?UTF-8?q?riences/=20=E5=88=A0=E9=99=A4=E5=B7=A5=E4=BD=9C=E7=BB=8F?= =?UTF-8?q?=E5=8E=86-/cms/userworkexperiences=20=E6=B1=82=E8=81=8C?= =?UTF-8?q?=E6=9C=9F=E6=9C=9B--=E5=8D=95=E4=B8=AA=E4=BF=AE=E6=94=B9=20=20/?= =?UTF-8?q?cms/appUser/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/cms/CmsAppUserController.java | 4 +++- .../cms/UserWorkExperiencesController.java | 13 ++++++++++--- .../java/com/ruoyi/cms/domain/ESJobDocument.java | 4 ++++ .../com/ruoyi/cms/service/impl/JobServiceImpl.java | 8 ++++++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java index bfea227..5379b5a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java @@ -95,11 +95,13 @@ public class CmsAppUserController extends BaseController * 修改APP用户 */ @ApiOperation("修改APP用户") - @PreAuthorize("@ss.hasPermi('bussiness:user:edit')") @Log(title = "APP用户", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AppUser appUser) { + if(appUser.getUserId()==null){ + return AjaxResult.error("参数userId为空"); + } return toAjax(appUserService.updateAppUser(appUser)); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java index 2f75a41..cd40ae9 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -61,10 +62,12 @@ public class UserWorkExperiencesController extends BaseController { * 保存 */ @ApiOperation("新增工作经历") - @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:add')") @Log(title = "工作经历", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody UserWorkExperiences userWorkExperiences){ + if(userWorkExperiences.getUserId()==null){ + userWorkExperiences.setUserId(SecurityUtils.getUserId()); + } return toAjax(userWorkExperiencesService.insertWorkExperiences(userWorkExperiences)); } @@ -72,10 +75,12 @@ public class UserWorkExperiencesController extends BaseController { * 修改 */ @ApiOperation("修改工作经历") - @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:edit')") @Log(title = "工作经历", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult update(@RequestBody UserWorkExperiences userWorkExperiences){ + if (userWorkExperiences.getId()==null){ + return AjaxResult.error("参数id未传递!"); + } return toAjax(userWorkExperiencesService.updateWorkExperiencesById(userWorkExperiences)); } @@ -83,10 +88,12 @@ public class UserWorkExperiencesController extends BaseController { * 删除 */ @ApiOperation("删除工作经历") - @PreAuthorize("@ss.hasPermi('cms:sensitiveworddata:remove')") @Log(title = "工作经历", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(Long[] ids){ + if(ids.length==0){ + return AjaxResult.error("参数ids未传递!"); + } return toAjax(userWorkExperiencesService.deleteWorkExperiencesIds(ids)); } 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 53c25dd..beae2f7 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 @@ -2,6 +2,7 @@ package com.ruoyi.cms.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.ruoyi.cms.domain.vo.CompanyVo; import com.ruoyi.common.core.domain.entity.Company; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -149,4 +150,7 @@ public class ESJobDocument @ApiModelProperty("信用代码") private String code; + + @ApiModelProperty("公司信息") + private CompanyVo companyVo; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index d5b96a0..c24b9df 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -833,7 +833,8 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe @Override public List sysRecommend(ESJobSearch esJobSearch) { - String jobKey=CacheConstants.SYS_JOB_IDS+ SecurityUtils.getUserId(); + Long userId=SecurityUtils.isLogin()?SecurityUtils.getUserId():null; + String jobKey=CacheConstants.SYS_JOB_IDS+ userId; RedisCache redisCache = SpringUtils.getBean(RedisCache.class); JSONArray cacheObject = redisCache.getCacheObject(jobKey); List jobList = new ArrayList<>(); @@ -843,7 +844,10 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe }else { jobList = cacheObject.toList(Long.class); } - AppUser appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + AppUser appUser=null; + if(userId!=null){ + appUser=appUserService.selectAppuserByIdcard(RoleUtils.getCurrentUseridCard()); + } //从es中查询 List jobListResult = iesJobSearchService.selectSysTextListExceptJobId(esJobSearch,jobList,appUser);