先进支部排行查询的是网格 所以关联grid即可

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

@@ -238,19 +238,9 @@
         FROM
             screen_index_data_monthly dm
         INNER JOIN screen_org_rank_data rd ON dm.org_id = rd.org_id
-         <if test="orgType != null and orgType != ''">
+        <!--查询的是网格的排行 下面条件是orgType = grid-->
-                <choose>
+        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    <when test="orgType == 'grid'">
+
-                        INNER JOIN screen_customer_grid org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.GRID_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                    <when test="orgType == 'agency'">
-                        INNER JOIN screen_customer_agency org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.AGENCY_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                      <when test="orgType == 'department'">
-                        INNER JOIN screen_customer_dept org ON org.CUSTOMER_ID = dm.CUSTOMER_ID AND org.DEPT_ID = dm.ORG_ID AND org.DEL_FLAG = '0'
-                    </when>
-                </choose>
-            </if>
         AND dm.month_id = rd.month_id
         WHERE
             dm.del_flag = '0'