答题人数，红包信息统计调整

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

@@ -656,8 +656,10 @@ public class FsUserServiceImpl implements IFsUserService
     @Override
     public UserDetailsVO getUserDetails(Long userId, Long fsUserId, String dateTag, Long userCompanyId) {
         UserDetailsVO countWatchCourse = fsUserMapper.getCountWatchCourse(userId, fsUserId, dateTag,userCompanyId);
-        UserDetailsVO countAnswer = fsUserMapper.getCountAnswer(userId, fsUserId, dateTag);
-        UserDetailsVO countRedPacket = fsUserMapper.getCountRedPacket(userId, fsUserId, dateTag);
+        FsUserCompanyUser fsUserCompanyUser = userCompanyUserService.selectFsUserCompanyUserById(userCompanyId);
+
+        UserDetailsVO countAnswer = fsUserMapper.getCountAnswer(fsUserCompanyUser.getCompanyUserId(), fsUserId, dateTag);
+        UserDetailsVO countRedPacket = fsUserMapper.getCountRedPacket(fsUserCompanyUser.getCompanyUserId(), fsUserId, dateTag);
         UserDetailsVO vo = new UserDetailsVO();
         if (countWatchCourse != null){
             BeanUtils.copyProperties(countWatchCourse, vo);

fs-service-system/src/main/resources/mapper/company/CompanyTagUserMapper.xml

@@ -111,9 +111,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join company_tag_user ctu on fu.user_id = ctu.user_id and ctu.company_user_id = #{params.companyUserId}
         left join fs_user_company_user ucu on ucu.user_id = fu.user_id
         where ucu.company_user_id = #{params.companyUserId}
-        <foreach collection="params.tagIds" item="tagId" open="(" separator="or" close=")">
-            and find_in_set(#{tagId}, ctu.tag_ids)
-        </foreach>
+        <if test="params.tagIds != null and params.tagIds.size() > 0">
+            AND (
+            <foreach collection="params.tagIds" item="tagId" separator="OR">
+                FIND_IN_SET(#{tagId}, ctu.tag_ids)
+            </foreach>
+            )
+        </if>
     </select>
 
 </mapper>