周伟鹏 / cnlive_shenhe · Commits

Commit 204e0d76bb3f12428e5095fcd453ec2d50debc34

Authored by 郑超
1 parent 08ce0638

update

Inline Side-by-side
Showing 2 changed files with 7 additions and 3 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @204e0d7
... ... @@ -124,7 +124,8 @@ public class VideosController extends BaseController {
124 124 * @return
125 125 */
126 126 @GetMapping("/page")
127   - public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id,
  127 + public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize,
  128 + String video_priority, String orderByClause, String sp_desc, String sp_Id, String source, String video_user_id,
128 129 String shen_auditor_id, Integer contentId, String video_id, HttpSession session) {
129 130 if (!StringUtils.isEmpty(shen_auditor_id)) {
130 131 if ((!"自动审核".equals(shen_auditor_id)) && (!"白名单".equals(shen_auditor_id))) {
... ... @@ -168,7 +169,8 @@ public class VideosController extends BaseController {
168 169 }
169 170 }
170 171  
171   - PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, sessionUserSpid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
  172 + PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page,
  173 + pageSize, video_priority, orderByClause, sessionUserSpid, userId, sp_Id, source, video_user_id, shen_auditor_id, video_id);
172 174 //查询查询条件
173 175 List<ShyActivity> activityList = shyActivityImpl.selectAll();
174 176 List<ShyVideos> list = videoPage.getList();
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @204e0d7
... ... @@ -110,7 +110,9 @@ public class VideosServiceImpl {
110 110 return shyVideosMapper.updateByPrimaryKey(shyVideos);
111 111 }
112 112  
113   - public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id, String source, String video_user_id, String shen_auditor_id, String video_id) {
  113 + public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page,
  114 + Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,
  115 + String source, String video_user_id, String shen_auditor_id, String video_id) {
114 116 Example example = new Example(ShyVideos.class);
115 117 Example.Criteria criteria = example.createCriteria();
116 118 Example.Criteria criteria2 = example.createCriteria();
... ...