diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordAdminService.java
index 50c69acff..8b6612fc8 100644
--- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordAdminService.java
+++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordAdminService.java
@@ -30,7 +30,7 @@ public class AccountLoginRecordAdminService extends BaseService {
     private AccountLoginRecordMapper accountLoginRecordMapper;
 
     public Page<AccountLoginRecordAdminVo> getAccountLoginRecordList(Integer pageSize, Integer pageNum,
-                                                                     Long erbanNo, String phone,
+                                                                     Long erbanNo, String phone, String email,
                                                                      Integer loginType, String deviceId,
                                                                      String ip, String ipRegion) {
         Page<AccountLoginRecordAdminVo> voPageInfo = new Page<>(pageNum, pageSize);
@@ -48,7 +48,8 @@ public class AccountLoginRecordAdminService extends BaseService {
         LambdaQueryWrapper<AccountLoginRecord> queryWrapper = Wrappers.<AccountLoginRecord>lambdaQuery()
                 .eq(null != uid, AccountLoginRecord::getUid, uid)
                 .eq(StringUtils.isNotBlank(deviceId), AccountLoginRecord::getDeviceId, deviceId)
-                .eq(StringUtils.isNotBlank(phone), AccountLoginRecord::getPhone, deviceId)
+                .eq(StringUtils.isNotBlank(phone), AccountLoginRecord::getPhone, phone)
+                .eq(StringUtils.isNotBlank(email), AccountLoginRecord::getEmail, email)
                 .eq(null != loginType, AccountLoginRecord::getLoginType, loginType)
                 .likeRight(StringUtils.isNotBlank(ip), AccountLoginRecord::getLoginIp, ip)
                 .like(StringUtils.isNotBlank(ipRegion), AccountLoginRecord::getLoginIpRegion, ipRegion)
diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordAdminController.java
index 3716783cf..1b74072f4 100644
--- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordAdminController.java
+++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/feedback/AccountLoginRecordAdminController.java
@@ -29,17 +29,17 @@ public class AccountLoginRecordAdminController extends BaseController {
      */
     @GetMapping(value = "/list")
     public PageResult<AccountLoginRecordAdminVo> getAccountBlockList(Integer pageSize, Integer pageNum,
-                                                                     String phone, Long erbanNo, Integer loginType,
+                                                                     Long erbanNo, Integer loginType, String phone, String email,
                                                                      String deviceId, String ip, String ipRegion){
         Page<AccountLoginRecordAdminVo> pageInfo = accountLoginRecordService.getAccountLoginRecordList(pageSize,pageNum,
-                erbanNo, phone, loginType, deviceId, ip, ipRegion);
+                erbanNo, phone, email, loginType, deviceId, ip, ipRegion);
         return new PageResult<>(pageInfo);
     }
 
     @SneakyThrows
     @RequestMapping("/export")
     public void export(HttpServletResponse response,
-                       String phone, Long erbanNo, Integer loginType,
+                       Long erbanNo, Integer loginType, String phone, String email,
                        String deviceId, String ip, String ipRegion) {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
@@ -47,7 +47,7 @@ public class AccountLoginRecordAdminController extends BaseController {
         String excelName = URLEncoder.encode("登录记录", "UTF-8");
         response.setHeader("Content-disposition", "attachment;filename=" + excelName + ExcelTypeEnum.XLSX.getValue());
         Page<AccountLoginRecordAdminVo> pageInfo = accountLoginRecordService.getAccountLoginRecordList(-1, -1,
-                erbanNo, phone, loginType, deviceId, ip, ipRegion);
+                erbanNo, phone, email, loginType, deviceId, ip, ipRegion);
         EasyExcel.write(response.getOutputStream(), AccountLoginRecordAdminVo.class).sheet("登录记录").doWrite(pageInfo.getRecords());
     }
 
diff --git a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java
index 8cae595a5..dd042f947 100644
--- a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java
+++ b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java
@@ -14,6 +14,8 @@ public class AccountLoginRecord {
 
     private String phone;
 
+    private String email;
+
     private Byte loginType;
 
     private String loginIp;
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 b045881d6..ee000aba1 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
@@ -245,6 +245,7 @@ public class MyUserDetailsServiceImpl implements MyUserDetailsService {
         accountLoginRecord.setLoginType(loginType);
         accountLoginRecord.setDeviceId(deviceInfo.getDeviceId());
         accountLoginRecord.setPhone(account.getPhone());
+        accountLoginRecord.setEmail(account.getEmail());
         accountLoginRecord.setApp(account.getApp());
         accountLoginRecord.setAppVersion(deviceInfo.getAppVersion());
         accountLoginRecord.setIspType(deviceInfo.getIspType());