From 5de4a49148636dce6568d37e4c62039934b0a188 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 十月 2025 16:36:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
index f1f2b60..bf06585 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TUserController.java
@@ -17,6 +17,7 @@
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.goods.api.model.OrderQuery;
import com.ruoyi.management.api.feignClient.ManagementClient;
import com.ruoyi.management.api.model.*;
import com.ruoyi.management.api.query.UseGuideQuery;
@@ -84,6 +85,15 @@
TUser byId = userService.getById(id);
return R.ok(byId);
}
+
+ @PostMapping("/listAll")
+ public R<List<TUser>> listAll(@RequestBody OrderQuery query){
+ List<TUser> list = userService.lambdaQuery()
+ .like(StringUtils.hasLength(query.getUserName()), TUser::getName, query.getUserName())
+ .like(StringUtils.hasLength(query.getPhone()), TUser::getPhone, query.getPhone()).list();
+ return R.ok(list);
+ }
+
@PostMapping("/vipInfoStudy")
@ApiOperation(value = "会员中心-获取会员说明、当前登录用户是否为会员、会员购买规格", tags = {"学习端-个人中心"})
@@ -1403,7 +1413,7 @@
@ApiOperation(value = "用户列表", tags = {"管理后台-用户管理"})
public R<PageInfo<AppUserVO>> couponReceive(@RequestBody AppUserQuery query) {
PageInfo<AppUserVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- List<AppUserVO> list = userService.listAll(query);
+ List<AppUserVO> list = userService.listAll(query,res);
for (AppUserVO appUserVO : list) {
if (appUserVO.getVipEndTime() == null) {
appUserVO.setIsVip(0);
@@ -1416,7 +1426,6 @@
}
}
res.setRecords(list);
- res.setTotal(list.size());
return R.ok(res);
}
@@ -1534,9 +1543,8 @@
@ApiOperation(value = "列表查询", tags = {"管理后台-会员管理"})
public R<PageInfo<VipOrderVO>> vipOrderList(@RequestBody AppUserQuery query) {
PageInfo<VipOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- List<VipOrderVO> list = vipOrderService.listAll(query);
+ List<VipOrderVO> list = vipOrderService.listAll(query,res);
res.setRecords(list);
- res.setTotal(list.size());
return R.ok(res);
}
}
--
Gitblit v1.7.1