Merge branches 'dev' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml

@@ -131,8 +131,8 @@
 
     <select id="selectUpToCalGrid" parameterType="map" resultType="com.epmet.plugins.result.WorkRecordSubRank">
         SELECT
-            sca.GRID_ID AS orgId,
-            sca.grid_name AS `NAME`,
+            scg.GRID_ID AS orgId,
+            scg.grid_name AS `NAME`,
             sum( m.PARTICIPATE_USER_TOTAL ) AS participateUserTotal,
             sum( m.ORGANIZE_TOTAL ) AS participateTotal
         FROM
@@ -140,11 +140,11 @@
         inner join screen_customer_grid scg
             on(m.ORG_ID=scg.grid_id
                 and scg.DEL_FLAG='0'
-                AND scg.ALL_PARENT_IDS like concat('%',#{agencyId},'%')
             )
         WHERE
             m.DEL_FLAG = '0'
             AND m.DATE_ID = #{dateId}
+            and m.org_id=#{gridId}
             AND m.TYPE_CODE IN
             <foreach item="typeCode" collection="typeCodeList" open="(" separator="," close=")">
                 #{typeCode}