Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

4 years ago · 5f749ed8fd
1 changed files with 2 additions and 2 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/plugins/ScreenWorkRecordOrgDailyDao.xml
+++ b/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