Merge remote-tracking branch 'origin/master'

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

@@ -256,10 +256,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and project = ${project}
             </if>
             <if test="common == null">
-                AND company_id IS NULL
+                AND company_id IS not NULL
             </if>
             <if test="common != null ">
-                AND company_id IS NOT NULL
+                AND company_id IS NULL
             </if>
         </where>
 
@@ -275,7 +275,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="tabType!=null and tabType=='company'">
             group by company_id,`month`
         </if>
-
+        <if test="tabType!=null and tabType=='common'">
+            group by course_id,`month`
+        </if>
     </select>
 
 </mapper>