Commit 1f5af5efb8313b52c38e027a182de0dcce5f0938

Authored by 王言钊
1 parent 23fd1ff6

修改判断条件

src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -464,7 +464,7 @@ public class VideosServiceImpl { @@ -464,7 +464,7 @@ public class VideosServiceImpl {
464 String source = shyVideo.getSource(); 464 String source = shyVideo.getSource();
465 // 根据source 查询审核类型 465 // 根据source 查询审核类型
466 Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source)); 466 Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source));
467 - 467 + logger.info("审核类型为:{}", shType);
468 ShyUsersfree shyUserfree = null; 468 ShyUsersfree shyUserfree = null;
469 //如果用户id存在 469 //如果用户id存在
470 if (CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())) { 470 if (CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())) {
@@ -473,8 +473,8 @@ public class VideosServiceImpl { @@ -473,8 +473,8 @@ public class VideosServiceImpl {
473 //初始化一个审核状态 473 //初始化一个审核状态
474 //审核类型,1:免审,2:机审,3:人工审 474 //审核类型,1:免审,2:机审,3:人工审
475 Integer shenheType = CommonConst.AUDIT_TYPE_USER; 475 Integer shenheType = CommonConst.AUDIT_TYPE_USER;
476 - //如果当前sp是免审sp source有传空的时候 默认给0 //如果存在免审用户  
477 - if (sites.contains(shyVideo.getSpid()) || shType.equals(CommonConst.AUDIT_TYPE_FREE) || (CommonUtils.isNotEmpty(shyVideo.getVideo_user_id()) && CommonUtils.isNotNull(shyUserfree))) { 476 + //如果当前sp是免审sp source有传空的时候 默认给0 //如果存在免审用户
  477 + if (sites.contains(shyVideo.getSpid()) || (CommonUtils.isNotNull(shType) && CommonConst.AUDIT_TYPE_FREE.equals(shType)) || CommonUtils.isNotNull(shyUserfree)) {
478 logger.info("进入已经免审渠道:{}", source); 478 logger.info("进入已经免审渠道:{}", source);
479 //免审 479 //免审
480 shenheType = CommonConst.AUDIT_TYPE_FREE; 480 shenheType = CommonConst.AUDIT_TYPE_FREE;