From 742271d2ce6a6bce82476ab34d2497bd2b172645 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Dec 2021 15:24:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

---
 src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
index d8a1fd6..6dc4dd2 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
@@ -176,13 +176,13 @@
         videoInfoVo.setCollectCnt(data.getCollectCnt());
         videoInfoVo.setStarCnt(data.getStarCnt());
 
-        VideoMemberEntity loginUser = LoginUserUtil.getLoginUser();
-        if (loginUser == null) {
-            videoInfoVo.setNotLogin(AppContants.FLAG_INT_N);
-            return videoInfoVo;
-        }
-
         if (AppContants.FLAG_INT_N.equals(videoInfoEntity.getIsFree())) {
+            VideoMemberEntity loginUser = LoginUserUtil.getLoginUser();
+            if (loginUser == null) {
+                videoInfoVo.setNotLogin(AppContants.FLAG_INT_N);
+                return videoInfoVo;
+            }
+
             VideoMemberEntity member = this.videoMemberMapper.selectById(loginUser.getId());
             if (AppContants.FLAG_INT_N.equals(member.getIsVip())) {
                 videoInfoVo.setNotVip(AppContants.FLAG_INT_N);

--
Gitblit v1.9.1