From a4eb20d342bd3796d68efce3d9bd6da5fa361338 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 20 Feb 2020 09:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=8E=92=E8=A1=8C=20?=
 =?UTF-8?q?=E5=92=8C=20=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=96=B0=E5=A2=9E=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=20=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/user/UserAnalysisDao.xml  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
index bf5eb9c19..27ab36dad 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/user/UserAnalysisDao.xml
+++ b/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"