From 06553100e69f93d2d78e44e5094ae814ed958b10 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Wed, 17 Jun 2026 18:04:28 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BD=95=E7=94=A8=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=95=E7=94=A8=E3=80=81=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E7=AE=80=E5=8E=86=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/cms/controller/app/AppFileController.java | 4 ++++ .../cms/controller/cms/EmployeeConfirmController.java | 8 ++++---- .../cms/controller/cms/UserWorkExperiencesController.java | 2 +- .../cms/service/impl/EmployeeConfirmServiceImpl.java | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java index 916c058..773c9ac 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppFileController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.List; @RestController @@ -38,6 +39,9 @@ public class AppFileController extends BaseController { @GetMapping("/list") public TableDataInfo list(File file) { + if(file.getBussinessid()==null){ + return getDataTable(new ArrayList<>()); + } List results = fileService.selectFileList(file); return getDataTable(results); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java index 1d5ae64..379e8e1 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/EmployeeConfirmController.java @@ -34,7 +34,7 @@ public class EmployeeConfirmController extends BaseController { * 列表 */ @ApiOperation("新入职员工确认信息列表") -// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:list')") + @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:list')") @RequestMapping("/list") public TableDataInfo list(EmployeeConfirm employeeConfirm){ List list=employeeConfirmService.getEmployeeConfirmList(employeeConfirm); @@ -45,7 +45,7 @@ public class EmployeeConfirmController extends BaseController { * 保存 */ @ApiOperation("新增新入职员工确认信息") -// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:add')") + @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:add')") @Log(title = "职员工确认信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EmployeeConfirm employeeConfirm){ @@ -53,7 +53,7 @@ public class EmployeeConfirmController extends BaseController { } @ApiOperation("修改新入职员工确认信息") -// @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:edit')") + @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:edit')") @Log(title = "职员工确认信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EmployeeConfirm employeeConfirm){ @@ -61,7 +61,7 @@ public class EmployeeConfirmController extends BaseController { } @ApiOperation("删除新入职员工确认信息") -// @PreAuthorize("@ss.hasPermi('app:employeeConfirm:remove')") + @PreAuthorize("@ss.hasPermi('cms:employeeConfirm:remove')") @Log(title = "公司", businessType = BusinessType.DELETE) @DeleteMapping("/{employeeConfirmIds}") public AjaxResult remove(@PathVariable Long[] employeeConfirmIds) 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 829ff29..7506440 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 @@ -40,7 +40,7 @@ public class UserWorkExperiencesController extends BaseController { * 列表 */ @ApiOperation("工作经历列表信息") - @PreAuthorize("@ss.hasPermi('management:match:details')") + @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:list')") @GetMapping("/list") public TableDataInfo list(UserWorkExperiences userWorkExperiences){ startPage(); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java index da2add3..5977f08 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/EmployeeConfirmServiceImpl.java @@ -47,6 +47,9 @@ public class EmployeeConfirmServiceImpl implements EmployeeConfirmService { } Job job=jobMapper.getJobInfo(employeeConfirm.getJobId()); //添加消息 + //获取申请消息 + JobApply jobApply=jobApplyMapper.selectById(employeeConfirm.getApplyId()); + employeeConfirm.setUserId(jobApply!=null?jobApply.getUserId():null); Notice notice=NoticeUtils.createLytzNotice(employeeConfirm,job); noticeMapper.insert(notice); return t;