修改企业直播带岗管理
This commit is contained in:
@@ -93,10 +93,10 @@ public class CompanyJobLiveController extends BaseController
|
|||||||
@ApiOperation("按企业id查询公司直播带岗列表")
|
@ApiOperation("按企业id查询公司直播带岗列表")
|
||||||
@PreAuthorize("@ss.hasPermi('cms:live:list')")
|
@PreAuthorize("@ss.hasPermi('cms:live:list')")
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo listPage()
|
public TableDataInfo listPage(CompanyJobLive companyJobLive)
|
||||||
{
|
{
|
||||||
startPage();
|
startPage();
|
||||||
List<CompanyJobLive> list = companyJobLiveService.selectByCompanyId();
|
List<CompanyJobLive> list = companyJobLiveService.selectByCompanyId(companyJobLive);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,5 +20,5 @@ public interface CompanyJobLiveMapper extends BaseMapper<CompanyJobLive>
|
|||||||
|
|
||||||
List<CompanyJobLive> selectAll(CompanyJobLive companyJobLive);
|
List<CompanyJobLive> selectAll(CompanyJobLive companyJobLive);
|
||||||
|
|
||||||
List<CompanyJobLive> selectByCompanyId(@Param("companyId") Long companyId);
|
List<CompanyJobLive> selectByCompanyId(CompanyJobLive companyJobLive);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,5 +50,5 @@ public interface ICompanyJobLiveService
|
|||||||
* 按公司id查询
|
* 按公司id查询
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<CompanyJobLive> selectByCompanyId();
|
List<CompanyJobLive> selectByCompanyId(CompanyJobLive companyJobLive);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,9 +54,10 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<CompanyJobLive> selectByCompanyId() {
|
public List<CompanyJobLive> selectByCompanyId(CompanyJobLive companyJobLive) {
|
||||||
Long companyId = getCompanyId();
|
Long companyId = getCompanyId();
|
||||||
return companyJobLiveMapper.selectByCompanyId(companyId);
|
companyJobLive.setCompanyId(companyId);
|
||||||
|
return companyJobLiveMapper.selectByCompanyId(companyJobLive);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Long getCompanyId() {
|
private Long getCompanyId() {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
<sql id="selectCompanyJobLiveVo">
|
<sql id="selectCompanyJobLiveVo">
|
||||||
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
|
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
|
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'
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectAll" parameterType="companyJobLive" resultMap="CompanyJobLiveResult">
|
<select id="selectAll" parameterType="companyJobLive" resultMap="CompanyJobLiveResult">
|
||||||
@@ -39,9 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
order by l.create_time desc
|
order by l.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectByCompanyId" resultMap="CompanyJobLiveResult">
|
<select id="selectByCompanyId" resultMap="CompanyJobLiveResult" parameterType="companyJobLive">
|
||||||
<include refid="selectCompanyJobLiveVo"/>
|
<include refid="selectCompanyJobLiveVo"/>
|
||||||
where l.company_id = #{companyId}
|
where l.company_id = #{companyId} and l.del_flag='0'
|
||||||
|
<if test="title != null and title != ''">
|
||||||
|
and l.title like '%' || #{title} || '%'
|
||||||
|
</if>
|
||||||
order by l.create_time desc
|
order by l.create_time desc
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ public class SysLoginService
|
|||||||
public String login(String username, String password, String code, String uuid)
|
public String login(String username, String password, String code, String uuid)
|
||||||
{
|
{
|
||||||
// 验证码校验
|
// 验证码校验
|
||||||
validateCaptcha(username, code, uuid);
|
// validateCaptcha(username, code, uuid);
|
||||||
// 登录前置校验
|
// 登录前置校验
|
||||||
loginPreCheck(username, password);
|
loginPreCheck(username, password);
|
||||||
// 用户验证
|
// 用户验证
|
||||||
|
|||||||
Reference in New Issue
Block a user