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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.constant.HttpStatus;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.exception.CustomException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.DictUtils;
 import com.fs.company.cache.ICompanyCacheService;
@@ -177,7 +178,7 @@ 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("该公司下面没有任何销售！");
+                throw new CustomException("该公司下面没有任何销售！");
             }
             userIds = companyUsers.stream()
                     .map(CompanyUser::getUserId)
@@ -281,7 +282,7 @@ 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("该公司下面没有任何销售！");
+                throw new CustomException("该公司下面没有任何销售！");
             }
             userIds = companyUsers.stream()
                     .map(CompanyUser::getUserId)