导出调整

fs-service/src/main/resources/application-druid-zkzh.yml

@@ -147,6 +147,6 @@ openIM:
 im:
     type: NONE
 #是否为新商户，新商户不走mpOpenId
-isNewWxMerchant: false
+isNewWxMerchant: true
 
 

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

@@ -842,6 +842,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test ='maps.logType !=null'>
                 and l.log_type = #{maps.logType}
             </if>
+            <if test ='maps.logType !=null'>
+                and  l.period_id = #{maps.periodId}
+            </if>
             <if test ='maps.companyId !=null'>
                 and l.company_id = #{maps.companyId}
             </if>