Merge remote-tracking branch 'origin/dev_data_fusion' into develop

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -206,13 +206,13 @@
             <if test="orgType != null and orgType != ''">
                 <choose>
                     <when test="orgType == 'grid'">
-                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                        INNER JOIN screen_customer_grid org ON  org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
                     <when test="orgType == 'agency'">
-                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                        INNER JOIN screen_customer_agency org ON  org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
                       <when test="orgType == 'department'">
-                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                        INNER JOIN screen_customer_dept org ON  org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                     </when>
                 </choose>
             </if>
@@ -278,13 +278,13 @@
         <if test="orgType != null and orgType != ''">
             <choose>
                 <when test="orgType == 'grid'">
-                    INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_grid org ON  org.GRID_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                 <when test="orgType == 'agency'">
-                    INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_agency org ON  org.AGENCY_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
                   <when test="orgType == 'department'">
-                    INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = score.CUSTOMER_ID AND org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
+                    INNER JOIN screen_customer_dept org ON  org.DEPT_ID = score.ORG_ID AND org.DEL_FLAG = '0'
                 </when>
             </choose>
         </if>