diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java
index 4beff18a5..51cc03b45 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/pretty/PrettyNumberExamineAdminService.java
@@ -34,8 +34,6 @@ public class PrettyNumberExamineAdminService {
     @Autowired
     private UsersService usersService;
     @Autowired
-    private PrettyNumberMapper mapper;
-    @Autowired
     private AdminUserService adminUserService;
     @Autowired
     private PrettyNumberExamineService prettyNumberExamineService;
@@ -53,7 +51,8 @@ public class PrettyNumberExamineAdminService {
         Page<PrettyNumberExamine> dbPage = new Page<>(pageNo, pageSize);
         LambdaQueryWrapper<PrettyNumberExamine> wrapper = Wrappers.<PrettyNumberExamine>lambdaQuery()
                 .eq(null != sid, PrettyNumberExamine::getPrettyNo, sid)
-                .eq(null != uid, PrettyNumberExamine::getUid, uid);
+                .eq(null != uid, PrettyNumberExamine::getUid, uid)
+                .orderByDesc(PrettyNumberExamine::getId);
 
         prettyNumberExamineService.page(dbPage, wrapper);
 
diff --git a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
index a11793dc7..cb68c2556 100644
--- a/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
+++ b/accompany-oauth2/accompany-oauth2-service/src/main/java/com/accompany/oauth2/service/MyUserDetailsServiceImpl.java
@@ -8,11 +8,9 @@ import com.accompany.common.redis.RedisKey;
 import com.accompany.common.status.BusiStatus;
 import com.accompany.common.utils.CommonUtil;
 import com.accompany.core.exception.ServiceException;
-import com.accompany.core.model.Account;
-import com.accompany.core.model.AccountLoginRecord;
-import com.accompany.core.model.PrettyNumber;
-import com.accompany.core.model.Users;
+import com.accompany.core.model.*;
 import com.accompany.core.mybatismapper.PrettyNumberMapper;
+import com.accompany.core.mybatismapper.PrettyNumberRecordMapper;
 import com.accompany.core.service.SysConfService;
 import com.accompany.core.service.account.AccountService;
 import com.accompany.core.service.account.LoginRecordService;
@@ -74,7 +72,7 @@ public class MyUserDetailsServiceImpl implements MyUserDetailsService {
     @Autowired
     private RegionService regionService;
     @Autowired
-    private PrettyNumberMapper prettyNumberMapper;
+    private PrettyNumberRecordMapper prettyNumberRecordMapper;
 
     /**
      * 不允许登录的用户账号类型
@@ -91,14 +89,13 @@ public class MyUserDetailsServiceImpl implements MyUserDetailsService {
             account = accountService.getAccountByErBanNo(Long.valueOf(username));
             //检查是否绑定了靓号
             if (null == account){
-                LambdaQueryWrapper<PrettyNumber> queryWrapper = Wrappers.<PrettyNumber>lambdaQuery()
-                        .eq(PrettyNumber::getUseErbanNo, Long.parseLong(username))
-                        .eq(PrettyNumber::getStatus, Constant.StatusV2.valid)
-                        .orderByDesc(PrettyNumber::getUpdateTime)
+                LambdaQueryWrapper<PrettyNumberRecord> queryWrapper = Wrappers.<PrettyNumberRecord>lambdaQuery()
+                        .eq(PrettyNumberRecord::getPrettyNo, Long.parseLong(username))
+                        .orderByDesc(PrettyNumberRecord::getId)
                         .last("limit 1");
-                PrettyNumber prettyNumber = prettyNumberMapper.selectOne(queryWrapper);
-                if (null != prettyNumber){
-                    account = accountService.getAccountByErBanNo(prettyNumber.getPrettyNo());
+                PrettyNumberRecord prettyNumberRecord = prettyNumberRecordMapper.selectOne(queryWrapper);
+                if (null != prettyNumberRecord){
+                    account = accountService.getAccountByUid(prettyNumberRecord.getUid());
                 }
             }
         }