Commit c8d3b3a80c3954f4541c1ff740b89eaafaca40c4

Authored by 徐近程
1 parent ee28418e

update

src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -262,6 +262,7 @@ public class VideosController extends BaseController { @@ -262,6 +262,7 @@ public class VideosController extends BaseController {
262 model.addAttribute("receive1", receive1); 262 model.addAttribute("receive1", receive1);
263 model.addAttribute("pageSize", pageSize); 263 model.addAttribute("pageSize", pageSize);
264 model.addAttribute("videoPage", videoPage); 264 model.addAttribute("videoPage", videoPage);
  265 + model.addAttribute("sp_Id", sp_Id);
265 return "page/video.html"; 266 return "page/video.html";
266 } 267 }
267 268
@@ -362,11 +363,14 @@ public class VideosController extends BaseController { @@ -362,11 +363,14 @@ public class VideosController extends BaseController {
362 * @param response 363 * @param response
363 */ 364 */
364 @GetMapping("excel") 365 @GetMapping("excel")
365 - public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, Integer source,String video_user_id,String orderByClause, HttpSession session, HttpServletResponse response) { 366 + public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, Integer source,String video_user_id,String orderByClause,Integer sp_Id, HttpSession session, HttpServletResponse response) {
366 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey()); 367 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
367 Integer spid = sessionUser.getSpid(); 368 Integer spid = sessionUser.getSpid();
368 String userId = sessionUser.getUserId(); 369 String userId = sessionUser.getUserId();
369 if (spid == 0) spid = null; 370 if (spid == 0) spid = null;
  371 + if(sp_Id!=null){
  372 + spid=sp_Id;
  373 + }
370 List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId, source, video_user_id); 374 List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId, source, video_user_id);
371 String fileName = "点播数据"; 375 String fileName = "点播数据";
372 String updater = "";//审核员名字 376 String updater = "";//审核员名字