From e56de5c2263a887631382b96e8ee35fe03257cc4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 01 三月 2026 00:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 c459048..6f1692c 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
@@ -8,6 +8,7 @@
 import com.xiaopeng.account.model.dto.XpOperationsUserDTO;
 import com.xiaopeng.account.model.query.XpOperationsUserPageQuery;
 import com.xiaopeng.account.model.query.XpOperationsUserQuery;
+import com.xiaopeng.account.service.IXpOperationsRoleService;
 import com.xiaopeng.account.service.IXpOperationsUserService;
 import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
 import com.xiaopeng.api.model.account.XpOperationsUser;
@@ -81,7 +82,7 @@
      * @return 运维用户列表
      */
     @PostMapping("/inner/xpOperationsUser/listByName")
-    public R<List<XpOperationsUser>> listByName(@RequestBody String nickName) {
+    public R<List<XpOperationsUser>> listByName(@RequestParam("nickName") String nickName) {
         return R.ok(xpOperationsUserService.listByName(nickName));
     }
 
@@ -97,7 +98,7 @@
         if (CollectionUtils.isEmpty(ids)) {
             return R.ok(new ArrayList<>());
         }
-        List<XpOperationsUserWithRoleVO> result = xpOperationsRoleMapper.selectUsersWithRoleByIds(ids);
+        List<XpOperationsUserWithRoleVO> result = xpOperationsUserService.selectUsersWithRoleByIds(ids);
         return R.ok(result);
     }
 

--
Gitblit v1.7.1