From 834f4b42af823fc58c43ce99e330dbeb2b98df5d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 22 Nov 2021 09:18:10 +0800
Subject: [PATCH] 保安员查询接口调整，排序按id 倒序排序

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml                        |    4 ++--
 src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml |    4 ++++
 src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java               |    1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
index 1400c89..677b211 100644
--- a/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
@@ -93,6 +93,7 @@
         <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
             and sar.create_time &lt;= #{accreditationRecords.endTime}
         </if>
+        order by sar.id desc
     </select>
 
     <!--自定义详情信息-->
@@ -208,6 +209,7 @@
         <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
             and sar.create_time &lt;= #{accreditationRecords.endTime}
         </if>
+        order by sar.id desc
     </select>
 
 
@@ -304,6 +306,7 @@
         <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
             and sar.create_time &lt;= #{accreditationRecords.endTime}
         </if>
+        order by sar.id desc
     </select>
 
 
@@ -400,6 +403,7 @@
         <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
             and sar.create_time &lt;= #{accreditationRecords.endTime}
         </if>
+        order by sar.id desc
     </select>
 
     <!--根据用户 id 查询上岗证申请记录-->
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index c995349..97a418d 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -88,6 +88,7 @@
 		ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
 		UserInfo userInfo = granter.grant(tokenParameter);
 
+
 		if (null!=s && s.equals("")) {
 			if (s.equals("0")) {
 				return authInfo.set("error_description", "用户未审核");
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 822efbb..227c70f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -133,7 +133,7 @@
         <if test="user.examinationType!=null and user.examinationType != ''">
             and bu.examination_type = #{user.examinationType}
         </if>
-        ORDER BY bu.id
+        ORDER BY bu.id desc
     </select>
 
     <select id="selectUserPage" resultMap="userResultMap">
@@ -190,7 +190,7 @@
         <if test="user.examinationType!=null and user.examinationType != ''">
             and examination_type = #{user.examinationType}
         </if>
-        ORDER BY bu.id
+        ORDER BY bu.id desc
     </select>
 
     <select id="getUser" resultMap="userResultMap">

--
Gitblit v1.9.3