update

徐近程
1 parent 31f62975
Showing 2 changed files with 5 additions and 14 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -292,19 +292,12 @@ public class VideosController extends BaseController {
      * @param response
      */
     @GetMapping("excel")
-    public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String sp_Id,Integer source,String video_user_id,String sp_desc,String orderByClause, HttpSession session, HttpServletResponse response) {
+    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) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
-        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-            ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
-            if (CommonUtils.isNotNull(shySite)) {
-                spid = shySite.getSpid();
-            }
-        } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
-            spid = null;
-        }
-        List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId,sp_Id, source, video_user_id);
+        if (spid == 0) spid = null;
+        List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId, source, video_user_id);
         String fileName = "点播数据";
         String updater = "";//审核员名字
         String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
@@ -265,7 +265,7 @@ public class VideosServiceImpl {
      * @param userId
      * @return
      */
-    public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,Integer source,String video_user_id) {
+    public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId,Integer source,String video_user_id) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -299,7 +299,7 @@ public class VideosServiceImpl {
         if (CommonUtils.isNotEmpty(video_priority)) {
             criteria.andEqualTo("video_priority", video_priority);
         }
-        if (CommonUtils.isNotNull(video_user_id)) {
+        if (CommonUtils.isNotEmpty(video_user_id)) {
             criteria.andEqualTo("video_user_id", video_user_id);
         }
@@ -309,8 +309,6 @@ public class VideosServiceImpl {
         if (CommonUtils.isNotNull(spid)) {
             criteria.andEqualTo("spid", spid);
-        } else if(CommonUtils.isNotEmpty(sp_Id)) {
-            criteria.andEqualTo("spid", sp_Id);
         }
         if (CommonUtils.isNotNull(receive)) {