党员排行 和 居民注册排行新增筛选条件 bug修复

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -52,16 +52,13 @@
             <when test='category != null and category == "1"'> order by t1.youngCount desc </when>
             <when test='category != null and category == "2"'> order by t1.oldCount asc </when>
             <when test='category != null and category == "3"'> order by t1.youngCount asc </when>
+            <when test='category != null and category == "7"'>order by t1.userCount desc </when>
+            <when test='category != null and category == "8"'>order by t1.userCount asc </when>
+            <when test='category != null and category == "4"'>order by t1.userCount desc </when>
+            <when test='category != null and category == "5"'>order by t1.partyMemberCount desc </when>
+            <when test='category != null and category == "6"'>order by residentCount desc </when>
             <otherwise> order by t1.streetId asc </otherwise>
         </choose>
-        <choose>
-            <when test='registerCount != null and registerCount == "0"'>,t1.userCount desc </when>
-            <when test='registerCount != null and registerCount == "1"'>,t1.userCount asc </when>
-            <when test='registerCount != null and registerCount == "2"'>,t1.userCount desc </when>
-            <when test='registerCount != null and registerCount == "3"'>,t1.partyMemberCount desc </when>
-            <when test='registerCount != null and registerCount == "4"'>,residentCount desc </when>
-        </choose>
-
     </select>
 
     <select id="selectListPartyAuthFailureCountByStreetId"