From 4496c2767ae0da3efc12ae1b25cb542f15084750 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 9 Jul 2021 18:15:41 +0800
Subject: [PATCH] =?UTF-8?q?index/month/indexscore=20SQL=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenIndexDataMonthlyDao.xml      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index 9d4129b914..e60c11babc 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -200,13 +200,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>
@@ -272,13 +272,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>