Merge branch 'dev'

王言钊
2 parents 70b0abe2 489efa9e
Showing 2 changed files with 2 additions and 3 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -118,7 +118,6 @@ public class LiveController extends BaseController {
     @GetMapping("/page")
     public Object getListLives(Model model, LiveDTO liveDTO, HttpSession session) {
         logger.info("列表请求参数:{}", JSON.toJSONString(liveDTO));
-        System.out.println("进入直播内容页");
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer spid = sessionUser.getSpid();
         String userId = sessionUser.getUserId();
@@ -350,7 +350,7 @@ public class VideosServiceImpl {
             criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
         }
-        if (videosDTO.getSource() != null) {
+        if (CommonUtils.isNotEmpty(videosDTO.getSource())) {
             criteria.andEqualTo("source", videosDTO.getSource());
         }
@@ -445,7 +445,7 @@ public class VideosServiceImpl {
     public void updateDianboAndShenhe(ShyVideos video, int dianboState) {
         //修改点播云的视频状态
         JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
-        logger.error("点播回调result:{}", result);
+        logger.info("点播回调result:{}", result);
         Integer code = result.getInteger("code");
         String errorCode = result.getString("errorCode");
         Integer shenheState = CommonConst.AUDIT_REFUSE;