Merge branch 'openImAndLive' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openImAndLive

fs-service/src/main/resources/mapper/course/FsUserWatchCourseStatisticsMapper.xml

@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="answerRightRate != null "> and answer_right_rate = #{answerRightRate}</if>
             <if test="redPacketNum != null "> and red_packet_num = #{redPacketNum}</if>
             <if test="redPacketAmount != null "> and red_packet_amount = #{redPacketAmount}</if>
+            <if test="companyBelongOwner != null "> and company_belong_owner like concat('%', #{companyBelongOwner}, '%')</if>
         </where>
     </select>
 
@@ -120,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="answerRightRate != null "> and answer_right_rate = #{answerRightRate}</if>
             <if test="redPacketNum != null "> and red_packet_num = #{redPacketNum}</if>
             <if test="redPacketAmount != null "> and red_packet_amount = #{redPacketAmount}</if>
+            <if test="companyBelongOwner != null "> and company_belong_owner like concat('%', #{companyBelongOwner}, '%')</if>
         </where>
         group by fs_user_watch_course_statistics.company_id, course_start_date_time
     </select>

fs-service/src/main/resources/mapper/course/FsUserWatchStatisticsMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="watchNum != null "> and watch_num = #{watchNum}</if>
             <if test="completeWatchNum != null "> and complete_watch_num = #{completeWatchNum}</if>
             <if test="completeWatchRate != null "> and complete_watch_rate = #{completeWatchRate}</if>
+            <if test="companyBelongOwner != null "> and company_belong_owner like concat('%', #{companyBelongOwner}, '%')</if>
         </where>
     </select>