kongzhizhen

fs-company/src/main/java/com/fs/company/controller/course/FsCourseWatchLogController.java

@@ -69,6 +69,9 @@ public class FsCourseWatchLogController extends BaseController
     {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
 
         if (param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
@@ -101,6 +104,9 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo deptList(FsCourseWatchLogListParam param) {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null || loginUser.getUser() == null) {
+            return getDataTable(new ArrayList<>());
+        }
 
 
         List<Long> combinedList = new ArrayList<>();
@@ -151,6 +157,9 @@ public class FsCourseWatchLogController extends BaseController
     {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getUser() == null || loginUser.getCompany() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyUserId( loginUser.getUser().getUserId());
 
         if (param.getSendType()==1&& param.getPeriodETime()!=null && param.getPeriodSTime()!=null) {
@@ -181,6 +190,9 @@ public class FsCourseWatchLogController extends BaseController
     {
         startPage();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
@@ -194,6 +206,9 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo qwWatchLogStatisticsList(QwWatchLogStatisticsListParam param)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
@@ -204,6 +219,9 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo myQwWatchLogStatisticsList(QwWatchLogStatisticsListParam param)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null || loginUser.getUser() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         param.setCompanyUserId(loginUser.getUser().getUserId());
         if (param.getSTime()==null||param.getETime()==null){
@@ -217,6 +235,9 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo qwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
@@ -227,6 +248,9 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo myQwWatchLogAllStatisticsList(QwWatchLogStatisticsListParam param)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null || loginUser.getUser() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         param.setCompanyUserId(loginUser.getUser().getUserId());
         if (param.getSTime()==null||param.getETime()==null){
@@ -239,6 +263,9 @@ public class FsCourseWatchLogController extends BaseController
     {
         startPage();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null) {
+            return getDataTable(new ArrayList<>());
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
@@ -250,6 +277,9 @@ public class FsCourseWatchLogController extends BaseController
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser == null || loginUser.getCompany() == null) {
+            return AjaxResult.error("用户未登录或未绑定公司");
+        }
         param.setCompanyId( loginUser.getCompany().getCompanyId());
         if (param.getSTime()==null||param.getETime()==null){
             return AjaxResult.error("请选择时间");

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -947,7 +947,9 @@ public class QwUserServiceImpl implements IQwUserService
             param.setUserid(user.getUserid());
             try {
                 QwOpenidResult qwOpenidResult = qwApiService.useridToOpenid(param, corpId);
-                qwUser.setOpenid(qwOpenidResult.getOpenid());
+                if(qwOpenidResult != null){
+                    qwUser.setOpenid(qwOpenidResult.getOpenid());
+                }
                 if (qw==null){
                     qwUserMapper.insertQwUser(qwUser);
                 }else {