From 31c64b0e5d957c87fa5620e4145d7cddb237305b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 13 二月 2026 16:49:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
index d488d32..9805a5f 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -2,11 +2,13 @@
import com.xiaopeng.account.mapper.XpOperationsRoleMapper;
+import com.xiaopeng.account.model.query.XpOperationsUserPageQuery;
import com.xiaopeng.account.service.IXpOperationsUserService;
import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.web.page.PageInfo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -98,17 +100,12 @@
/**
* 根据条件查询用户及角色信息
- * @param dto 查询条件
+ * @param query 查询条件
* @return 用户及角色信息列表
*/
- @ApiOperation(value = "根据条件查询用户不分页列表", tags = {"管理后台-车队管理"})
+ @ApiOperation(value = "根据条件查询用户分页列表", tags = {"管理后台-车队管理"})
@PostMapping("/api/v1/xpOperationsUser/queryByConditions")
- public R<List<XpOperationsUserWithRoleVO>> getList(@RequestBody XpOperationsUserQueryDTO dto) {
- List<XpOperationsUserWithRoleVO> result = xpOperationsRoleMapper.selectUsersByConditions(
- dto.getNickName(),
- dto.getPhoneNumber(),
- dto.getRoleId()
- );
- return R.ok(result);
+ public R<PageInfo<XpOperationsUserWithRoleVO>> getList(@RequestBody XpOperationsUserPageQuery query) {
+ return R.ok(xpOperationsUserService.selectUserPageByConditions(query));
}
}
--
Gitblit v1.7.1