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

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml

@@ -108,18 +108,19 @@
             (
             SELECT
                 f.ID,
-                f.AGENCY_ID
+                log.AGENCY_ID
             FROM
                 fact_origin_project_main_daily f
-            INNER JOIN dim_agency da ON f.PIDS LIKE concat( '%', da.ID, '%' )
-            AND da.AGENCY_DIM_TYPE = 'all'
-            AND da.`LEVEL` = #{level}
-            AND da.CUSTOMER_ID = #{customerId}
             INNER JOIN fact_origin_project_log_daily log ON f.ID = log.PROJECT_ID
             AND log.ACTION_CODE = 'close'
             AND log.DEL_FLAG = '0'
             AND log.CUSTOMER_ID = #{customerId}
             AND log.MONTH_ID = #{monthId}
+            INNER JOIN dim_agency da ON log.PIDS LIKE concat( '%', da.ID, '%' )
+            AND da.AGENCY_DIM_TYPE = 'all'
+            AND da.`LEVEL` = #{level}
+            AND da.CUSTOMER_ID = #{customerId}
+
             WHERE
                 1 = 1
                 AND f.ORIGIN = 'issue'