fixed bug

src/main/java/com/qkdata/biz/sys/service/SysUserService.java

@@ -140,19 +140,22 @@ public class SysUserService extends BaseServiceImpl<SysUserMapper, SysUserPO> {
 
     public FullUserInfo findFullUserInfo(String username) {
         FullUserInfo userInfo = baseMapper.selectFullUserInfo(username);
-        List<SysRoleModel> roleModels = sysRoleService.getUserRoles(userInfo.getId());
-        for (SysRoleModel role : roleModels){
-            if (role.getCode().equals(BizConstants.ROLE_ENTERPRISE_ADMIN)){
-                userInfo.setEnterpriesMgr(true);
-                break;
+        if (userInfo != null){
+            List<SysRoleModel> roleModels = sysRoleService.getUserRoles(userInfo.getId());
+            for (SysRoleModel role : roleModels){
+                if (role.getCode().equals(BizConstants.ROLE_ENTERPRISE_ADMIN)){
+                    userInfo.setEnterpriesMgr(true);
+                    break;
+                }
             }
-        }
-        if (userInfo.getEnterpriseId() != null){
-            OrganizationPO orgPo = orgService.getById(userInfo.getEnterpriseId());
-            if (orgPo != null){
-                userInfo.setEnterpriseName(orgPo.getName());
+            if (userInfo.getEnterpriseId() != null){
+                OrganizationPO orgPo = orgService.getById(userInfo.getEnterpriseId());
+                if (orgPo != null){
+                    userInfo.setEnterpriseName(orgPo.getName());
+                }
             }
         }
+
         return userInfo;
     }
 

src/main/java/com/qkdata/biz/web/service/UserCenterService.java

@@ -75,11 +75,22 @@ public class UserCenterService {
             }else if (course.getChargeModel() == CourseChargeModelEnum.VIP_FREE){
                 if (userInfo.getType() == AccountTypeEnum.USER){
                     throw new BusinessException("您还不是会员，请先成为会员再观看");
+                }else if (userInfo.getType() == AccountTypeEnum.ENTERPRISE_VIP){
+                    if(userInfo.getVipStartTime() == null || userInfo.getVipEndTime() == null){
+                        throw new BusinessException("您是企业会员，尚未领取包月时长");
+                    }
+                    LocalDateTime now = LocalDateTime.now();
+                    if (!(now.isAfter(userInfo.getVipStartTime()) && now.isBefore(userInfo.getVipEndTime()))){
+                        throw new BusinessException("您的会员已过期，请续费后再观看");
+                    }
+                }else if (userInfo.getType() == AccountTypeEnum.VIP){
+                    LocalDateTime now = LocalDateTime.now();
+                    if (!(now.isAfter(userInfo.getVipStartTime()) && now.isBefore(userInfo.getVipEndTime()))){
+                        throw new BusinessException("您的会员已过期，请续费后再观看");
+                    }
                 }
-                LocalDateTime now = LocalDateTime.now();
-                if (!(now.isAfter(userInfo.getVipStartTime()) && now.isBefore(userInfo.getVipEndTime()))){
-                    throw new BusinessException("您的会员已过期，请续费后再观看");
-                }
+
+
             }else if (course.getChargeModel() == CourseChargeModelEnum.PAY){
                 UserCourseAuthPO authPO = userCourseAuthService.getOne(Wrappers.<UserCourseAuthPO>lambdaQuery().eq(UserCourseAuthPO::getUserId,userId).eq(UserCourseAuthPO::getCourseId,courseId));
                 if (authPO == null){