shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-04-07 16:00:27 +08:00
parent 9a6625905a
commit 5bb1bc6b43
6 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserController.java
View File

@@ -53,7 +53,7 @@ public class UserController extends BaseController {
*/ */
@SaCheckPermission("cai:user:list") @SaCheckPermission("cai:user:list")
@GetMapping("/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); Page<UserAdminVo> result = userService.pageAdmin(pageQuery, query);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }

2
ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
*/ */
public interface UserMapper extends BaseMapper<User> { 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> pageApp(@Param("build") Page<Object> build, @Param("query") UserMapperQuery query);
Page<UserListVo> greetPageApp(@Param("build") Page<Object> build, @Param("query") GreetQuery query); Page<UserListVo> greetPageApp(@Param("build") Page<Object> build, @Param("query") GreetQuery query);

1
ruoyi-cai/src/main/java/com/ruoyi/cai/mq/handle/LoginNotifyHandle.java
View File

@@ -100,6 +100,7 @@ public class LoginNotifyHandle implements IHandle {
if(StringUtils.isNotBlank(imei)){ if(StringUtils.isNotBlank(imei)){
update.setImei(imei); update.setImei(imei);
} }
update.setId(userInfo.getId());
userInfoService.updateById(update); userInfoService.updateById(update);
} }

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserService.java
View File

@@ -21,7 +21,7 @@ public interface UserService extends IService<User> {
User getByUsername(String username); 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> pageApp(PageQuery page, UserQuery query);
Page<UserListVo> greetPageApp(PageQuery page, GreetQuery query); Page<UserListVo> greetPageApp(PageQuery page, GreetQuery query);

2
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
View File

@@ -96,7 +96,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
} }
@Override @Override
public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, User query) { public Page<UserAdminVo> pageAdmin(PageQuery pageQuery, UserAdminVo query) {
return baseMapper.pageAdmin(pageQuery.build(),query); return baseMapper.pageAdmin(pageQuery.build(),query);
} }

3
ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
View File

@@ -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_info t2 on t1.id = t2.user_id
left join cai_user t3 on t1.invite_id = t3.id left join cai_user t3 on t1.invite_id = t3.id
<where> <where>
<if test="query.lastLoginIp != null">
and t2.last_login_ip = #{query.lastLoginIp}
</if>
<if test="query.isAnchor != null"> <if test="query.isAnchor != null">
and t1.is_anchor = #{query.isAnchor} and t1.is_anchor = #{query.isAnchor}
</if> </if>