From 5bb1bc6b43a0544819d8e6c1d2d2c30c1057c7ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Sun, 7 Apr 2024 16:00:27 +0800
Subject: [PATCH] 123

---
 .../com/ruoyi/web/controller/cai/admin/UserController.java     | 2 +-
 ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java   | 2 +-
 .../main/java/com/ruoyi/cai/mq/handle/LoginNotifyHandle.java   | 1 +
 ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java | 2 +-
 .../main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java  | 2 +-
 ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml         | 3 +++
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
index 1a27d798..c21c6d42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
@@ -53,7 +53,7 @@ public class UserController extends BaseController {
      */
     @SaCheckPermission("cai:user:list")
     @GetMapping("/list")
-    public TableDataInfo<UserAdminVo> list(User query, PageQuery pageQuery) {
+    public TableDataInfo<UserAdminVo> list(UserAdminVo query, PageQuery pageQuery) {
         Page<UserAdminVo> result = userService.pageAdmin(pageQuery, query);
         return TableDataInfo.build(result);
     }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
index e79dfbd8..d95456aa 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface UserMapper extends BaseMapper<User> {
 
-    Page<UserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("query") User query);
+    Page<UserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("query") UserAdminVo query);
     Page<UserListVo> pageApp(@Param("build") Page<Object> build, @Param("query") UserMapperQuery query);
     Page<UserListVo> greetPageApp(@Param("build") Page<Object> build, @Param("query") GreetQuery query);
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/LoginNotifyHandle.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/LoginNotifyHandle.java
index fef14c47..e85ae1d6 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/LoginNotifyHandle.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/LoginNotifyHandle.java
@@ -100,6 +100,7 @@ public class LoginNotifyHandle implements IHandle {
         if(StringUtils.isNotBlank(imei)){
             update.setImei(imei);
         }
+        update.setId(userInfo.getId());
         userInfoService.updateById(update);
     }
 
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
index ac3c2447..af5793a1 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
@@ -21,7 +21,7 @@ public interface UserService extends IService<User> {
 
     User getByUsername(String username);
 
-    Page<UserAdminVo> pageAdmin(PageQuery pageQuery, User query);
+    Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo query);
 
     Page<UserListVo> pageApp(PageQuery page, UserQuery query);
     Page<UserListVo> greetPageApp(PageQuery page, GreetQuery query);
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
index 6e7da972..7697febd 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
@@ -96,7 +96,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, User query) {
+    public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo query) {
         return baseMapper.pageAdmin(pageQuery.build(),query);
     }
 
diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
index eac977f6..ee71fc99 100644
--- a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
+++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
@@ -11,6 +11,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join cai_user_info t2 on t1.id = t2.user_id
         left join cai_user t3 on t1.invite_id = t3.id
         <where>
+            <if test="query.lastLoginIp != null">
+                and t2.last_login_ip = #{query.lastLoginIp}
+            </if>
             <if test="query.isAnchor != null">
                 and t1.is_anchor = #{query.isAnchor}
             </if>