feat: 添加管理员能看到所有数据和所有统计

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyTagUserServiceImpl.java

@@ -118,8 +118,14 @@ public class CompanyTagUserServiceImpl implements ICompanyTagUserService
                 keywords = param.getKeyword().split(",");
             }
         }
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param != null ? param.getUserId() : null);
+        if (companyUser != null && companyUser.isAdmin()){
+            companyId = companyUser.getCompanyId();
+        }
         //获取所有销售
-        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : null,null);
+        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : null, companyId);
         List<Long> userIds = Collections.emptyList();
         if(companyUsers != null && !companyUsers.isEmpty()){
             userIds = companyUsers.stream().map(CompanyUser::getUserId).collect(Collectors.toList());

fs-service-system/src/main/java/com/fs/store/mapper/FsUserMapper.java

@@ -217,7 +217,7 @@ public interface FsUserMapper
     List<FsUserPageListVO> selectFsUserPageListNew(FsUserPageListParam param);
     Long selectFsUserPageListCount(FsUserPageListParam param);
 
-    List<UserListCountVO> getUserNumber(@Param("userId") Long userId);
+    List<UserListCountVO> getUserNumber(@Param("userId") Long userId, @Param("companyId") Long companyId);
 
     int getRepeatUserNumber(@Param("userId") Long userId);
 
@@ -246,9 +246,9 @@ public interface FsUserMapper
 
     void transferCompanyUser(FsUserTransferParamDTO param);
 
-    FsUserSummaryCountVO countUserSummary(@Param("userId") Long userId);
+    FsUserSummaryCountVO countUserSummary(@Param("userId") Long userId, @Param("companyId") Long companyId);
 
-    List<FsUserSummaryCountTagVO> countTag(@Param("userId") Long userId);
+    List<FsUserSummaryCountTagVO> countTag(@Param("userId") Long userId, @Param("companyId") Long companyId);
 
     Map<String, Long> countUserCourse(UserStatisticsCommonParam param);
 
@@ -258,13 +258,13 @@ public interface FsUserMapper
 
     Map<String, Long> countCourseDetails(UserStatisticsCommonParam param);
 
-    List<FsUserRankingVO> countUserRankingByComplete(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsUserRankingVO> countUserRankingByComplete(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
-    List<FsUserRankingVO> countUserRankingByRight(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsUserRankingVO> countUserRankingByRight(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
-    List<FsCourseRankingVO> countCourseRankingByComplete(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsCourseRankingVO> countCourseRankingByComplete(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
-    List<FsCourseRankingVO> countCourseRankingByRight(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsCourseRankingVO> countCourseRankingByRight(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
     List<FsCourseAnalysisCountVO> courseAnalysisCourseCount(CourseAnalysisParam param);
 
@@ -272,9 +272,9 @@ public interface FsUserMapper
 
     List<FsCourseAnalysisCountVO> courseAnalysisAnswerCount(CourseAnalysisParam param);
 
-    CompanyUserSummaryCountVO companyUserCount(@Param("companyUserId")String companyUserId);
+    CompanyUserSummaryCountVO companyUserCount(@Param("companyUserId")String companyUserId, @Param("companyId") Long companyId);
 
-    CompanyUserSummaryCountVO newUserRedPacketCount(@Param("companyUserId")String companyUserId);
+    CompanyUserSummaryCountVO newUserRedPacketCount(@Param("companyUserId")String companyUserId, @Param("companyId") Long companyId);
 
     List<FsUser> getFsUserByCompanyUserAndId(@Param("companyUserId")Long companyUserId, @Param("userId") Long userId);
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -596,7 +596,14 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public UserListPageVO getUserNumber(Long userId) {
-        List<UserListCountVO> list = fsUserMapper.getUserNumber(userId);
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
+        List<UserListCountVO> list = fsUserMapper.getUserNumber(userId, companyId);
         Map<String, Integer> map = list.stream()
                 .collect(Collectors.toMap(UserListCountVO::getStatus, UserListCountVO::getNum, (v1, v2) -> v1));
         UserListPageVO pageVO = new UserListPageVO();
@@ -672,8 +679,15 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public FsUserSummaryCountVO userSummaryCount(Long userId) {
-        FsUserSummaryCountVO fsUserSummaryCountVO = fsUserMapper.countUserSummary(userId);
-        List<FsUserSummaryCountTagVO> countTagList = fsUserMapper.countTag(userId);
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
+        FsUserSummaryCountVO fsUserSummaryCountVO = fsUserMapper.countUserSummary(userId, companyId);
+        List<FsUserSummaryCountTagVO> countTagList = fsUserMapper.countTag(userId, companyId);
         fsUserSummaryCountVO.setTagList(countTagList);
         return fsUserSummaryCountVO;
     }
@@ -686,6 +700,12 @@ public class FsUserServiceImpl implements IFsUserService
     private FsUserStatisticsVO getUserStatistics(UserStatisticsCommonParam param) {
         FsUserStatisticsVO fsUserStatisticsVO = new FsUserStatisticsVO();
 
+        // 判断是否是管理员
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+        if (companyUser != null && companyUser.isAdmin()){
+            param.setUserId(0L);
+            param.setCompanyId(companyUser.getCompanyId());
+        }
         // 获取课程统计
         Map<String, Long> couserMap = fsUserMapper.countUserCourse(param);
         if (couserMap != null) {
@@ -727,6 +747,11 @@ public class FsUserServiceImpl implements IFsUserService
     public FsUserStatisticsVO userStatisticsDetails(UserStatisticsCommonParam param) {
         FsUserStatisticsVO userStatisticsVO = getUserStatistics(param);
 
+        // 判断是否是管理员
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+        if (companyUser != null && companyUser.isAdmin()){
+            param.setUserId(0L);
+        }
         //统计课程数据详情，在查询统计详情的时候需要显示
         Map<String, Long> courseDetailsMap = fsUserMapper.countCourseDetails(param);
         if(courseDetailsMap != null && courseDetailsMap.get("courseNum") != null && courseDetailsMap.get("videoNum") != null && courseDetailsMap.get("courseUserNum") != null){
@@ -740,25 +765,39 @@ public class FsUserServiceImpl implements IFsUserService
     @Override
     public List<FsUserRankingVO> userRanking(Long userId, String startTime, String endTime, String periodId, String videoId, String order, Integer type) {
         List<FsUserRankingVO> listVO = Collections.emptyList();
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
         if(type == 1){
             //按完播率
-            listVO = fsUserMapper.countUserRankingByComplete(userId, startTime, endTime, periodId, videoId, order);
+            listVO = fsUserMapper.countUserRankingByComplete(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
         if(type == 2){
             //按正确率
-            listVO = fsUserMapper.countUserRankingByRight(userId, startTime, endTime, periodId, videoId, order);
+            listVO = fsUserMapper.countUserRankingByRight(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
         return listVO;
     }
 
     @Override
     public List<FsCourseRankingVO> courseRanking(Long userId, String startTime, String endTime, String periodId, String videoId, String order, Integer type) {
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
         List<FsCourseRankingVO> list = Collections.emptyList();
         if(type == 1){
-            list = fsUserMapper.countCourseRankingByComplete(userId, startTime, endTime, periodId, videoId, order);
+            list = fsUserMapper.countCourseRankingByComplete(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
         if(type == 2){
-            list = fsUserMapper.countCourseRankingByRight(userId, startTime, endTime, periodId, videoId, order);
+            list = fsUserMapper.countCourseRankingByRight(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
 
         return list;
@@ -830,8 +869,15 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public CompanyUserSummaryCountVO companyUserSummaryCount(Long userId, String companyUserId) {
-        CompanyUserSummaryCountVO companyUserCount = fsUserMapper.companyUserCount(companyUserId);
-        CompanyUserSummaryCountVO newUserRedPacketCount = fsUserMapper.newUserRedPacketCount(companyUserId);
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            companyUserId = String.valueOf(0);
+            companyId = companyUser.getCompanyId();
+        }
+        CompanyUserSummaryCountVO companyUserCount = fsUserMapper.companyUserCount(companyUserId, companyId);
+        CompanyUserSummaryCountVO newUserRedPacketCount = fsUserMapper.newUserRedPacketCount(companyUserId, companyId);
         CompanyUserSummaryCountVO vo = new CompanyUserSummaryCountVO();
         BeanUtils.copyProperties(companyUserCount, vo);
         vo.setUserRedPacketNum(newUserRedPacketCount.getUserRedPacketNum());

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -618,9 +618,13 @@
             fs_user
                 LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
                 LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
-        WHERE
-           (company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
-            and fs_user.is_del = 0
+        WHERE fs_user.is_del = 0
+        <if test="userId != null and userId != 0 ">
+            and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="companyId != null ">
+            and fs_user.company_id = #{companyId}
+        </if>
         GROUP BY
             fs_user.`status`
     </select>
@@ -640,8 +644,14 @@
 
     <select id="getCountWatchCourse" resultType="UserDetailsVO">
         SELECT
-        ifnull( complete_watch_count, 0 ) AS completeWatchCount ,
-        ifnull( watch_times, 0 ) AS watchTimes,
+        <if test="dateTag == null or dateTag =='' ">
+            ifnull( sum(complete_watch_count), 0 ) AS completeWatchCount ,
+            ifnull( sum(watch_times), 0 ) AS watchTimes,
+        </if>
+        <if test="dateTag != null and dateTag !='' ">
+            ifnull( complete_watch_count, 0 ) AS completeWatchCount ,
+            ifnull( watch_times, 0 ) AS watchTimes,
+        </if>
         fs_user.user_id
         FROM
         fs_user_course_count
@@ -664,11 +674,10 @@
                 </when>
             </choose>
         </if>
+           and fs_user.user_id = #{fsUserId}
         </where>
         GROUP BY
         fs_user.user_id
-        HAVING
-        fs_user.user_id = #{fsUserId}
     </select>
 
     <select id="getCountAnswer" resultType="UserDetailsVO">
@@ -680,8 +689,8 @@
                     fs_course_answer_logs
                         LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
                         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-                WHERE
-                (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
+                <where>
+
                     <if test="dateTag != null and dateTag !='' ">
                         <choose>
                             <when test = "dateTag == '今天'">
@@ -698,10 +707,10 @@
                             </when>
                         </choose>
                     </if>
+                and fs_user.user_id = #{fsUserId}
+                </where>
                 GROUP BY
                     fs_user.user_id
-                HAVING
-                    fs_user.user_id = #{fsUserId}
             ) AS answerTime,
             (
                 SELECT
@@ -710,9 +719,8 @@
                     fs_course_answer_logs
                         LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
                         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-                WHERE
-                (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
-                  AND fs_course_answer_logs.is_right = 1
+            <where>
+                fs_course_answer_logs.is_right = 1
                 <if test="dateTag != null and dateTag !='' ">
                     <choose>
                         <when test = "dateTag == '今天'">
@@ -729,10 +737,10 @@
                         </when>
                     </choose>
                 </if>
+                and fs_user.user_id = #{fsUserId}
+            </where>
                 GROUP BY
                     fs_user.user_id
-                HAVING
-                    fs_user.user_id = #{fsUserId}
             ) AS answerRightTime;
     </select>
 
@@ -745,9 +753,8 @@
             fs_course_red_packet_log
                 LEFT JOIN fs_user ON fs_user.user_id = fs_course_red_packet_log.user_id
                 LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-        WHERE
-        (company_user.user_id = #{userId} or company_user.parent_id = #{userId} )
-        and fs_course_red_packet_log.status = 1
+        <where>
+        fs_course_red_packet_log.status = 1
         <if test="dateTag != null and dateTag !='' ">
                 <choose>
                     <when test = "dateTag == '今天'">
@@ -764,10 +771,10 @@
                     </when>
                 </choose>
             </if>
+            and  fs_user.user_id = #{fsUserId}
+        </where>
         GROUP BY
         fs_user.user_id
-        HAVING
-        fs_user.user_id = #{fsUserId}
     </select>
 
     <select id="getUserVipCountByCompanyUserId" resultType="java.util.Map">
@@ -790,15 +797,24 @@
         SELECT (SELECT count(fs_user.user_id)
                 FROM fs_user
                          LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
-                WHERE (
-                          company_user.user_id = #{userId}
-                              OR company_user.parent_id = #{userId}
-                          ) and fs_user.is_del = 0) as userTotal,
+                WHERE fs_user.is_del = 0
+                <if test="userId != null and userId != 0 ">
+                    and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+                </if>
+                <if test="companyId != null ">
+                    and fs_user.company_id = #{companyId}
+                </if>
+                  ) as userTotal,
                (SELECT count(fs_user.user_id)
                 FROM fs_user
                          LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
-                WHERE (company_user.user_id = #{userId} OR company_user.parent_id = #{userId})
-                and fs_user.is_del = 0
+                WHERE fs_user.is_del = 0
+                <if test="userId != null and userId != 0 ">
+                    and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+                </if>
+                <if test="companyId != null ">
+                    and fs_user.company_id = #{companyId}
+                </if>
                   AND to_days(fs_user.create_time) = to_days(now())) as todayNewUser
     </select>
 
@@ -811,7 +827,15 @@
                 LEFT JOIN fs_user ON fs_user.user_id = company_tag_user.user_id
                 LEFT JOIN company_tag ON FIND_IN_SET( company_tag.tag_id, company_tag_user.tag_ids ) > 0
                 LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
-        where (company_user.user_id = #{userId} or company_user.parent_id = #{userId} ) and company_tag.tag_id is not null
+        <where>
+        <if test="userId != null and userId != 0 ">
+            and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="companyId != null ">
+            and fs_user.company_id = #{companyId}
+        </if>
+           and company_tag.tag_id is not null
+        </where>
         GROUP BY
             company_tag.tag_id
     </select>
@@ -826,8 +850,13 @@
                         LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
                         LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
                         LEFT JOIN fs_user_course_period_days fcpd ON FIND_IN_SET(fcpd.period_id, fcc.course_ids) > 0
-        WHERE
-                    ( company_user.user_id = #{userId}  OR company_user.parent_id = #{userId}  )
+                <where>
+                    <if test="userId != null and userId != 0 ">
+                        and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+                    </if>
+                    <if test="userId != null and userId == 0 ">
+                        and fs_user.company_id = #{companyId}
+                    </if>
                     <if test="startTime != null and startTime !='' ">
                             and fcc.create_time &gt;= #{startTime}
                     </if>
@@ -844,7 +873,7 @@
                     <if test="companyUserId != null and companyUserId != ''">
                         AND company_user.user_id = #{companyUserId}
                     </if>
-
+                </where>
             ) as courseWatchNum,
             (
                 SELECT
@@ -854,8 +883,13 @@
                         LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
                         LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
                         LEFT JOIN fs_user_course_period_days fcpd ON FIND_IN_SET(fcpd.period_id, fcc.course_ids) > 0
-                WHERE
-                    ( company_user.user_id = #{userId}  OR company_user.parent_id = #{userId}  )
+                <where>
+                    <if test="userId != null and userId != 0 ">
+                        and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+                    </if>
+                    <if test="userId != null and userId == 0 ">
+                        and fs_user.company_id = #{companyId}
+                    </if>
                   AND fcc.complete_watch_count > 0
                     <if test="startTime != null and startTime !='' ">
                         and fcc.create_time &gt;= #{startTime}
@@ -873,6 +907,7 @@
                     <if test="companyUserId != null and companyUserId != ''">
                         AND company_user.user_id = #{companyUserId}
                     </if>
+                </where>
             ) as courseCompleteNum
     </select>
 
@@ -885,8 +920,13 @@
         fs_course_answer_logs
         LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-        WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        <where>
+        <if test="userId != null and userId != 0 ">
+            and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="userId != null and userId == 0 ">
+            and fs_user.company_id = #{companyId}
+        </if>
         <if test="startTime != null and startTime !='' ">
             AND fs_course_answer_logs.create_time &gt;= #{startTime}
         </if>
@@ -903,6 +943,7 @@
         <if test="companyUserId != null and companyUserId != ''">
             AND company_user.user_id = #{companyUserId}
         </if>
+        </where>
         ) AS answerNum,
         (
         SELECT
@@ -911,8 +952,13 @@
         fs_course_answer_logs
         LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-        WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        <where>
+        <if test="userId != null and userId != 0 ">
+            and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="userId != null and userId == 0 ">
+            and fs_user.company_id = #{companyId}
+        </if>
         AND fs_course_answer_logs.is_right = 1
         <if test="startTime != null and startTime !='' ">
             AND fs_course_answer_logs.create_time &gt;= #{startTime}
@@ -930,6 +976,7 @@
         <if test="companyUserId != null and companyUserId != ''">
             AND company_user.user_id = #{companyUserId}
         </if>
+        </where>
         ) AS answerRightNum
     </select>
 
@@ -942,8 +989,13 @@
                 fs_course_red_packet_log flog
                     LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
                     LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-            WHERE
-                ( company_user.user_id = #{userId}  OR company_user.parent_id = #{userId}  )
+                <where>
+                <if test="userId != null and userId != 0 ">
+                    and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+                </if>
+                <if test="userId != null and userId == 0 ">
+                    and fs_user.company_id = #{companyId}
+                </if>
                 <if test="startTime != null and startTime !='' ">
                     AND flog.create_time &gt;= #{startTime}
                 </if>
@@ -960,6 +1012,7 @@
                 <if test="companyUserId != null and companyUserId != ''">
                     AND company_user.user_id = #{companyUserId}
                 </if>
+                </where>
         ) AS redPacketNum,
         (
             SELECT
@@ -968,8 +1021,13 @@
                 fs_course_red_packet_log flog
                     LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
                     LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-            WHERE
-                ( company_user.user_id = #{userId}  OR company_user.parent_id = #{userId}  )
+                <where>
+                <if test="userId != null and userId != 0 ">
+                    and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+                </if>
+                <if test="userId != null and userId == 0 ">
+                    and fs_user.company_id = #{companyId}
+                </if>
                 <if test="startTime != null and startTime !='' ">
                     AND flog.create_time &gt;= #{startTime}
                 </if>
@@ -986,6 +1044,7 @@
                 <if test="companyUserId != null and companyUserId != ''">
                     AND company_user.user_id = #{companyUserId}
                 </if>
+                </where>
         ) AS redPacketAmount
     </select>
 
@@ -999,9 +1058,12 @@
             LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
             WHERE 1=1
             AND FIND_IN_SET(#{companyId}, fpd.company_id)
-            <if test="userId != null and userId != ''">
+            <if test="userId != null and userId != 0 ">
                 AND fs_user.company_user_id = #{userId}
             </if>
+            <if test="userId != null and userId == 0 ">
+                and fs_user.company_id = #{companyId}
+            </if>
             <if test="periodId != null and periodId != ''">
                 AND fcpd.period_id =  #{periodId}
             </if>
@@ -1018,9 +1080,12 @@
             LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
             WHERE 1=1
             AND FIND_IN_SET(#{companyId}, fpd.company_id)
-            <if test="userId != null and userId != ''">
+            <if test="userId != null and userId != 0 ">
                 AND fs_user.company_user_id = #{userId}
             </if>
+            <if test="userId != null and userId == 0 ">
+                and fs_user.company_id = #{companyId}
+            </if>
             <if test="periodId != null and periodId != ''">
                 AND fcpd.period_id =  #{periodId}
             </if>
@@ -1047,9 +1112,12 @@
             AND fs_user.company_user_id = #{companyUserId}
         </if>
         <where>
-            <if test="userId != null and userId != ''">
+            <if test="userId != null and userId != 0 ">
                 AND fs_user.company_user_id = #{userId}
             </if>
+            <if test="userId != null and userId == 0 ">
+                and fs_user.company_id = #{companyId}
+            </if>
         </where>
          ) as courseUserNum
     </select>
@@ -1065,8 +1133,13 @@
         LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
         LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
         LEFT JOIN fs_user_course_period_days fcpd ON FIND_IN_SET( fcpd.period_id, fcc.course_ids ) > 0
-        WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        <where>
+        <if test="userId != null and userId != 0 ">
+            AND  ( fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="userId != null and userId == 0 ">
+            and fs_user.company_id = #{companyId}
+        </if>
         <if test="startTime != null and startTime !='' ">
             AND fcc.create_time &gt;= #{startTime}
         </if>
@@ -1079,6 +1152,7 @@
         <if test="videoId != null and videoId != ''">
             AND fcpd.video_id = #{videoId}
         </if>
+        </where>
         group by fcc.user_id
         <choose>
             <when test="order != null and order == 'asc'">
@@ -1105,8 +1179,13 @@
             fs_course_answer_logs
                 LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
                 LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-        WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+            <where>
+            <if test="userId != null and userId != 0 ">
+                AND  ( fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+            </if>
+            <if test="userId != null and userId == 0 ">
+                and fs_user.company_id = #{companyId}
+            </if>
             <if test="startTime != null and startTime !='' ">
                 AND fs_course_answer_logs.create_time &gt;= #{startTime}
             </if>
@@ -1119,6 +1198,7 @@
             <if test="videoId != null and videoId != ''">
                 AND fs_course_answer_logs.video_id = #{videoId}
             </if>
+            </where>
         group by fs_user.user_id
         <choose>
             <when test="order != null and order == 'asc'">
@@ -1150,8 +1230,13 @@
         LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
         LEFT JOIN fs_user_course_period_days fcpd ON FIND_IN_SET( fcpd.period_id, fcc.course_ids ) > 0
         LEFT JOIN fs_user_course_video fcv ON fcv.video_id = fcpd.video_id
-        WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        <where>
+        <if test="userId != null and userId != 0 ">
+            AND ( fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="userId != null and userId == 0 ">
+            and fs_user.company_id = #{companyId}
+        </if>
         <if test="startTime != null and startTime !='' ">
             AND fcc.create_time &gt;= #{startTime}
         </if>
@@ -1164,6 +1249,7 @@
         <if test="videoId != null and videoId != ''">
             AND fcpd.video_id = #{videoId}
         </if>
+        </where>
         GROUP BY
         fcpd.video_id
         <choose>
@@ -1196,8 +1282,13 @@
         LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         LEFT JOIN fs_user_course_video fcv ON fcv.video_id = fs_course_answer_logs.video_id
-        WHERE
-        ( company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        <where>
+        <if test="userId != null and userId != 0 ">
+            AND ( fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
+        <if test="userId != null and userId == 0 ">
+            and fs_user.company_id = #{companyId}
+        </if>
         <if test="startTime != null and startTime !='' ">
             AND fs_course_answer_logs.create_time &gt;= #{startTime}
         </if>
@@ -1210,6 +1301,7 @@
         <if test="videoId != null and videoId != ''">
             AND fs_course_answer_logs.video_id = #{videoId}
         </if>
+        </where>
         GROUP BY
         fs_course_answer_logs.video_id
         <choose>
@@ -1245,14 +1337,20 @@
         LEFT JOIN fs_user ON fs_user.user_id = fcc.user_id
         LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
         LEFT JOIN fs_user_course_period_days fcpd ON FIND_IN_SET( fcpd.period_id, fcc.course_ids ) > 0
-        WHERE
-        company_user.user_id = #{companyUserId}
+        <where>
+        <if test="companyUserId != null and companyUserId != 0 ">
+            AND fs_user.company_user_id = #{companyUserId}
+        </if>
+        <if test="companyUserId != null and companyUserId == 0 ">
+            and fs_user.company_id = #{companyId}
+        </if>
         <if test="periodId != null and periodId != ''">
             AND fcpd.period_id =  #{periodId}
         </if>
         <if test="videoId != null and videoId != ''">
             AND fcpd.video_id = #{videoId}
         </if>
+        </where>
         GROUP BY
         fcpd.video_id
     </select>
@@ -1268,8 +1366,11 @@
         LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         <where>
-            <if test="companyUserId != null and companyUserId !='' ">
-                AND company_user.user_id = #{companyUserId}
+            <if test="companyUserId != null and companyUserId != 0 ">
+                AND fs_user.company_user_id = #{companyUserId}
+            </if>
+            <if test="companyUserId != null and companyUserId == 0 ">
+                and fs_user.company_id = #{companyId}
             </if>
             <if test="periodId != null and periodId != ''">
                 AND flog.period_id =  #{periodId}
@@ -1309,8 +1410,11 @@
         LEFT JOIN fs_user ON fs_user.user_id = fs_course_answer_logs.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
         <where>
-            <if test="companyUserId != null and companyUserId !='' ">
-                AND company_user.user_id = #{companyUserId}
+            <if test="companyUserId != null and companyUserId != 0 ">
+                AND fs_user.company_user_id = #{companyUserId}
+            </if>
+            <if test="companyUserId != null and companyUserId == 0 ">
+                and fs_user.company_id = #{companyId}
             </if>
             <if test="periodId != null and periodId != ''">
                 AND fs_course_answer_logs.period_id =  #{periodId}
@@ -1334,7 +1438,14 @@
         SELECT
             (
                 SELECT count( fs_user.user_id ) FROM fs_user LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
-                WHERE company_user.user_id = #{companyUserId}
+            <where>
+                <if test="companyUserId != null and companyUserId != '' and companyUserId != '0' ">
+                    AND fs_user.company_user_id = #{companyUserId}
+                </if>
+                <if test="companyUserId != null and companyUserId != '' and companyUserId == '0' ">
+                    and fs_user.company_id = #{companyId}
+                </if>
+            </where>
             ) AS userTotal,
             (
                 SELECT
@@ -1342,11 +1453,17 @@
                 FROM
                     fs_user
                         LEFT JOIN company_user ON fs_user.company_user_id = company_user.user_id
-                WHERE
-                    company_user.user_id = #{companyUserId}
+                <where>
+                    <if test="companyUserId != null and companyUserId != '' and companyUserId != '0' ">
+                        AND fs_user.company_user_id = #{companyUserId}
+                    </if>
+                    <if test="companyUserId != null and companyUserId != '' and companyUserId == '0' ">
+                        and fs_user.company_id = #{companyId}
+                    </if>
                   and fs_user.is_del = 0
                   AND to_days( fs_user.create_time ) = to_days(
                         now())
+                 </where>
             ) AS todayNewUser
     </select>
 
@@ -1357,8 +1474,14 @@
         FROM
             fs_course_red_packet_log flog
                 LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
-        WHERE
-            fs_user.company_user_id = #{companyUserId}
+        <where>
+        <if test="companyUserId != null and companyUserId != '' and companyUserId != '0' ">
+            AND fs_user.company_user_id = #{companyUserId}
+        </if>
+        <if test="companyUserId != null and companyUserId != '' and companyUserId == '0' ">
+            and fs_user.company_id = #{companyId}
+        </if>
+        </where>
     </select>
 
     <select id="selectFsUserPageListCount" resultType="java.lang.Long">