From 0e11a468b04c8500a14f9eaa9b3e8f088802d2be Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 9 Jun 2020 15:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E4=B8=8E?=
 =?UTF-8?q?PC=E4=B8=80=E8=87=B4-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-06-09?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index ee9143af4..f20dacb0e 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -1331,14 +1331,15 @@
         </choose>
         ) user
         where
-        <if test="selectFlag == '0'">
-            user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '2'
-        </if>
-        <if test="selectFlag == '1'">
-            user.AUTHENTICATED_TYPE = '1' and user.AUTHENTICATED_FLAG = '1'
-        </if>
-        ORDER BY
-        user.CREATED_TIME DESC
+        <choose>
+            <when test="selectFlag != null and selectFlag != 0">
+                user.AUTHENTICATED_TYPE = '1' and user.AUTHENTICATED_FLAG = '1'
+            </when>
+            <otherwise>
+                user.AUTHENTICATED_TYPE = '0' AND user.AUTHENTICATED_FLAG = '2'
+            </otherwise>
+        </choose>
+        ORDER BY user.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
 
@@ -1422,7 +1423,8 @@
             epaf.REGIST_TIME,
             epaf.CREATED_TIME,
             epaf.USER_ID,
-            epaf.GRID_ID
+            epaf.GRID_ID,
+            epaf.CREATED_TIME
             FROM epdc_party_authentication_failed epaf
             WHERE epaf.del_flag = '0'
             <choose>
@@ -1440,6 +1442,8 @@
         ) ep
         left join epdc_user uu on uu.ID = ep.USER_ID
         where uu.DEL_FLAG = '0'
+        ORDER BY ep.CREATED_TIME DESC
+        LIMIT #{pageIndex},#{pageSize}
     </select>
 
 </mapper>