From 176f0b1acd6562c1ba63519439344d9c744344d9 Mon Sep 17 00:00:00 2001 From: chenshaohua <635616957@qq.com> Date: Thu, 18 Jun 2026 00:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E7=9B=B4?= =?UTF-8?q?=E6=92=AD=E5=B8=A6=E5=B2=97=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/controller/cms/CompanyJobLiveController.java | 4 ++-- .../java/com/ruoyi/cms/mapper/CompanyJobLiveMapper.java | 2 +- .../com/ruoyi/cms/service/ICompanyJobLiveService.java | 2 +- .../cms/service/impl/CompanyJobLiveServiceImpl.java | 5 +++-- .../main/resources/mapper/app/CompanyJobLiveMapper.xml | 9 ++++++--- .../com/ruoyi/framework/web/service/SysLoginService.java | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyJobLiveController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyJobLiveController.java index b6e6000..3611264 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyJobLiveController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CompanyJobLiveController.java @@ -93,10 +93,10 @@ public class CompanyJobLiveController extends BaseController @ApiOperation("按企业id查询公司直播带岗列表") @PreAuthorize("@ss.hasPermi('cms:live:list')") @GetMapping("/list") - public TableDataInfo listPage() + public TableDataInfo listPage(CompanyJobLive companyJobLive) { startPage(); - List list = companyJobLiveService.selectByCompanyId(); + List list = companyJobLiveService.selectByCompanyId(companyJobLive); return getDataTable(list); } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyJobLiveMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyJobLiveMapper.java index 5451e80..0d5f3cc 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyJobLiveMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/CompanyJobLiveMapper.java @@ -20,5 +20,5 @@ public interface CompanyJobLiveMapper extends BaseMapper List selectAll(CompanyJobLive companyJobLive); - List selectByCompanyId(@Param("companyId") Long companyId); + List selectByCompanyId(CompanyJobLive companyJobLive); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyJobLiveService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyJobLiveService.java index 263dd4f..3f3aa72 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyJobLiveService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/ICompanyJobLiveService.java @@ -50,5 +50,5 @@ public interface ICompanyJobLiveService * 按公司id查询 * @return */ - List selectByCompanyId(); + List selectByCompanyId(CompanyJobLive companyJobLive); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java index ef3cc40..8471214 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java @@ -54,9 +54,10 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService { } @Override - public List selectByCompanyId() { + public List selectByCompanyId(CompanyJobLive companyJobLive) { Long companyId = getCompanyId(); - return companyJobLiveMapper.selectByCompanyId(companyId); + companyJobLive.setCompanyId(companyId); + return companyJobLiveMapper.selectByCompanyId(companyJobLive); } private Long getCompanyId() { diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyJobLiveMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyJobLiveMapper.xml index fa60c82..a48bc90 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyJobLiveMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyJobLiveMapper.xml @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select l.id, l.title, l.live_url, l.description, l.start_time, l.end_time, l.company_id, c.name company_name, l.create_by, l.create_time, l.update_by, l.update_time from company_job_live l - left join company c on l.company_id = c.company_id + inner join company c on l.company_id = c.company_id and c.del_flag='0' - - where l.company_id = #{companyId} + where l.company_id = #{companyId} and l.del_flag='0' + + and l.title like '%' || #{title} || '%' + order by l.create_time desc diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index c6ad00f..b88f07b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -97,7 +97,7 @@ public class SysLoginService public String login(String username, String password, String code, String uuid) { // 验证码校验 - validateCaptcha(username, code, uuid); +// validateCaptcha(username, code, uuid); // 登录前置校验 loginPreCheck(username, password); // 用户验证