fix: 进线客户统计

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

@@ -310,10 +310,12 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
                 }
             }
             // 销售名称
-            CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(item.getCompanyUserId());
-            if(companyUser != null) {
-                item.setQwUserName(companyUser.getUserName());
-                item.setCreateTime(companyUser.getCreateTime());
+            if(ObjectUtils.isNotNull(item.getCompanyUserId())){
+                CompanyUser companyUser = companyUserCacheService.selectCompanyUserById(item.getCompanyUserId());
+                if(companyUser != null) {
+                    item.setQwUserName(companyUser.getUserName());
+                    item.setCreateTime(companyUser.getCreateTime());
+                }
             }
 
             list.add(item);

fs-service-system/src/main/resources/mapper/qw/QwWatchLogMapper.xml

@@ -133,7 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COUNT(1) AS line,project,course_id,video_id
              from hy_watch_log
             <where>
-                 <if test="companyUserIds != null">
+                 <if test="companyUserIds != null and companyUserIds.size() != 0">
                      and company_user_id in
                      <foreach collection="companyUserIds" item="item" open="(" close=")" separator=",">
                          ${item}
@@ -207,7 +207,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         count(1)
         from hy_watch_log
         <where>
-            <if test="companyUserId">
+            <if test="companyUserIds != null">
                 and company_user_id in
                 <foreach collection="companyUserIds" item="item" open="(" close=")" separator=",">
                     ${item}