会员看课分析统计修改

fs-admin-saas/src/main/java/com/fs/course/controller/FsCourseWatchLogController.java

@@ -80,9 +80,6 @@ public class FsCourseWatchLogController extends BaseController
     {
         logger.info("会员课程数据汇总 参数: {}",param);
 
-        if(param.getCompanyId() == null){
-            throw new CustomException("必须选择公司！");
-        }
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
@@ -100,9 +97,6 @@ public class FsCourseWatchLogController extends BaseController
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
-        if(param.getCompanyId() == null){
-            throw new CustomException("必须选择公司！");
-        }
         return qwWatchLogService.selectQwWatchLogStatisticsListVONew(param);
     }
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:statisticsList')")

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

@@ -404,14 +404,18 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         // 获取当前公司下的所有销售
         List<Long> userIds;
         if(param.getCompanyUserId()  == null && (param.getUserIds() == null || param.getUserIds().isEmpty())){
-            List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
-            if(CollectionUtils.isEmpty(companyUsers)){
-                throw new CustomException("该公司下面没有任何销售！");
+            if(param.getCompanyId() == null){
+                userIds = null;
+            } else {
+                List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
+                if(CollectionUtils.isEmpty(companyUsers)){
+                    throw new CustomException("该公司下面没有任何销售！");
+                }
+                userIds = companyUsers.stream()
+                        .map(CompanyUser::getUserId)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
             }
-            userIds = companyUsers.stream()
-                    .map(CompanyUser::getUserId)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
         } else if((param.getUserIds() != null && !param.getUserIds().isEmpty())){
             userIds = param.getUserIds().stream().map(Long::valueOf).collect(Collectors.toList());
         }else{
@@ -483,14 +487,18 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         List<Long> userIds = null;
         // 获取当前公司下的所有销售
         if(param.getCompanyUserId()  == null){
-            List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
-            if(CollectionUtils.isEmpty(companyUsers)){
-                throw new CustomException("该公司下面没有任何销售！");
+            if(param.getCompanyId() == null){
+                userIds = null;
+            } else {
+                List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
+                if(CollectionUtils.isEmpty(companyUsers)){
+                    throw new CustomException("该公司下面没有任何销售！");
+                }
+                userIds = companyUsers.stream()
+                        .map(CompanyUser::getUserId)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList());
             }
-            userIds = companyUsers.stream()
-                    .map(CompanyUser::getUserId)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
         } else {
             userIds = new ArrayList<>();
             userIds.add(param.getCompanyUserId());