Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

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

@@ -27,6 +27,8 @@ import com.fs.store.service.cache.IFsUserCacheService;
 import com.fs.store.service.cache.IFsUserCourseCacheService;
 import com.github.pagehelper.PageInfo;
 import com.hc.openapi.tool.util.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -174,7 +176,9 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         // 获取当前公司下的所有销售
         if(param.getCompanyUserId()  == null){
             List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
-
+            if(CollectionUtils.isEmpty(companyUsers)){
+                throw new IllegalArgumentException("该公司下面没有任何销售！");
+            }
             userIds = companyUsers.stream()
                     .map(CompanyUser::getUserId)
                     .filter(Objects::nonNull)
@@ -276,7 +280,9 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         List<Long> userIds;
         if(param.getCompanyUserId()  == null){
             List<CompanyUser> companyUsers = companyUserMapper.selectCompanyUserByCompanyId(param.getCompanyId());
-
+            if(CollectionUtils.isEmpty(companyUsers)){
+                throw new IllegalArgumentException("该公司下面没有任何销售！");
+            }
             userIds = companyUsers.stream()
                     .map(CompanyUser::getUserId)
                     .filter(Objects::nonNull)