From 978915a43878ae4e9166a54596a2f1ad4433adbc Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Thu, 16 Oct 2025 23:39:02 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java
index 26dd46f..d823fa6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/group/ImGroupController.java
@@ -13,6 +13,7 @@
import com.ruoyi.im.service.NeteaseTeamService;
import com.ruoyi.system.domain.NeteaseTeam;
import com.ruoyi.system.domain.UserAccount;
+import com.ruoyi.system.domain.vo.GroupVo;
import com.ruoyi.system.domain.vo.UserAccountVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,19 +55,19 @@
*/
// @PreAuthorize("@ss.hasPermi('im:group:list')")
@GetMapping("/list")
- public TableDataInfo list(@PathVariable(value = "keyword", required = false) String keyword)
+ public TableDataInfo list(GroupVo vo)
{
// 创建查询条件包装器
LambdaQueryWrapper<NeteaseTeam> queryWrapper = new LambdaQueryWrapper<>();
// 只有当 keyword 不为空时才添加 OR 条件
- if (ObjectUtil.isNotEmpty(keyword)) {
+ if (ObjectUtil.isNotEmpty(vo.getKeywords())) {
queryWrapper.and(wrapper -> wrapper
- .eq(NeteaseTeam::getTid, keyword)
+ .eq(NeteaseTeam::getTid, vo.getKeywords())
.or()
- .eq(NeteaseTeam::getOwnerAccountId, keyword)
+ .eq(NeteaseTeam::getOwnerAccountId, vo.getKeywords())
.or()
- .eq(NeteaseTeam::getName,keyword)
+ .eq(NeteaseTeam::getName,vo.getKeywords())
);
}
--
Gitblit v1.9.3