修改判断条件

王言钊
1 parent cbb05486
Showing 1 changed file with 4 additions and 4 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -474,24 +474,24 @@ public class VideosServiceImpl {
         //审核类型，1:免审，2:机审，3:人工审
         Integer shenheType = CommonConst.AUDIT_TYPE_USER;
         //如果当前sp是免审sp  source有传空的时候 默认给0                                             //如果存在免审用户
-        if (sites.contains(shyVideo.getSpid()) || shType.equals(CommonConst.AUDIT_TYPE_FREE) || CommonUtils.isNotNull(shyUserfree)) {
+        if (sites.contains(shyVideo.getSpid()) || shType.equals(CommonConst.AUDIT_TYPE_FREE) || (CommonUtils.isNotNull(shyUserfree) && CommonUtils.isNotNull(shyUserfree))) {
             logger.info("进入已经免审渠道:{}", source);
             //免审
             shenheType = CommonConst.AUDIT_TYPE_FREE;
-        }  else {
+        } else {
             //如果栏目是“目击者”
             if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
                 // 机审
                 shenheType = CommonConst.AUDIT_TYPE_MACHANE;
                 // 如果是人工审
-                if (shType.equals(CommonConst.AUDIT_TYPE_USER)){
+                if (shType.equals(CommonConst.AUDIT_TYPE_USER)) {
                     shenheType = shType;
                 }
                 // 如果栏目是朋友圈
             } else if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
                 // 免审
                 shenheType = CommonConst.AUDIT_TYPE_FREE;
-            }else {
+            } else {
                 shenheType = shType;
             }
         }