【工作端小程序】用户管理数据查询改为与PC一致-王公峰-2020-06-09

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>