热心市民积分排行，限制不是党员

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

@@ -13,6 +13,7 @@
         WHERE
             del_flag = '0'
             AND all_parent_ids LIKE CONCAT('%',#{agencyId},'%')
+            and PARTY_FLAG = 0
         ORDER BY
             point_total DESC,
             convert(user_name using gbk) ASC
@@ -67,7 +68,7 @@
             </if>
         </if>
         ORDER BY
-            point_total DESC
+            point_total DESC, convert(user_name using gbk) ASC
         LIMIT #{topNum}
     </select>
 
@@ -127,6 +128,7 @@
         WHERE
                 m.DEL_FLAG = '0'
                 and scg.AREA_CODE like CONCAT(#{areaCode},'%')
+                and scg.PARTY_FLAG = 0
         ORDER BY
                 m.POINT_TOTAL DESC,
                 convert(m.user_name using gbk) ASC