From bab6c7bbf9a3942fa89ed399bc6c5f2971bedb15 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 30 Aug 2025 22:16:31 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
index 5743639..94ce615 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
@@ -2,6 +2,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -26,6 +28,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Collection;
import java.util.List;
import java.util.Objects;
@@ -52,15 +55,15 @@
LambdaQueryWrapper<UserAccount> queryWrapper = new LambdaQueryWrapper<>();
// 只有当 keyword 不为空时才添加 OR 条件
- if (ObjectUtil.isNotEmpty(vo.getKeyword())) {
+ if (ObjectUtil.isNotEmpty(vo.getKeywords())) {
queryWrapper.and(wrapper -> wrapper
- .eq(UserAccount::getId, vo.getKeyword())
+ .eq(UserAccount::getId, vo.getKeywords())
.or()
- .eq(UserAccount::getPhoneNumber, vo.getKeyword())
+ .like(UserAccount::getPhoneNumber, vo.getKeywords())
.or()
- .eq(UserAccount::getAccount, vo.getKeyword())
+ .like(UserAccount::getAccount, vo.getKeywords())
.or()
- .eq(UserAccount::getNickname, vo.getKeyword())
+ .like(UserAccount::getNickname, vo.getKeywords())
);
}
@@ -75,8 +78,16 @@
queryWrapper.orderByDesc(UserAccount::getCreateTime);
startPage();
List<UserAccount> list = userAccountService.list(queryWrapper);
+
+ PageInfo<UserAccount> pageInfo = new PageInfo<>(list);
+
List<UserAccountOut> toList = ConverterUtil.convertToList(list, UserAccountOut.class);
- return getDataTable(toList);
+ TableDataInfo rspData = new TableDataInfo();
+ rspData.setCode(HttpStatus.SUCCESS);
+ rspData.setMsg("查询成功");
+ rspData.setRows(toList);
+ rspData.setTotal(pageInfo.getTotal());
+ return rspData;
}
/**
@@ -136,6 +147,5 @@
return Result.error("注册失败，请稍后再试！");
}
}
-
}
--
Gitblit v1.9.3