|
@@ -230,13 +230,18 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
|
|
|
public List<ImGroupMember> findChatGroupAllMemberInfo(Map<String, Object> params) {
|
|
|
|
|
|
Object search = params.get("search");
|
|
|
+ if (search == null) {
|
|
|
+ search = params.get("keyword");
|
|
|
+ }
|
|
|
+ Object keyword = search;
|
|
|
+
|
|
|
Boolean groupMute = params.get("groupMute") == null ? null : Boolean.valueOf(params.get("groupMute").toString());
|
|
|
List<String> groupRoleTypes = params.get("groupRoleTypes") == null ? new ArrayList() : ((List) params.get("groupRoleTypes"));
|
|
|
String groupRoleTypesTr = String.join(",", groupRoleTypes);
|
|
|
List<ImGroupMember> members = getBaseMapper().selectList(Wrappers.<ImGroupMember>query().lambda()
|
|
|
- .and(Objects.nonNull(search) && StringUtils.isNotEmpty(search.toString()),
|
|
|
- e->e.eq(ImGroupMember::getUserId, search).or()
|
|
|
- .like(ImGroupMember::getNickname, search))
|
|
|
+ .and(Objects.nonNull(keyword) && StringUtils.isNotEmpty(keyword.toString()),
|
|
|
+ e->e.eq(ImGroupMember::getUserId, keyword).or()
|
|
|
+ .like(ImGroupMember::getNickname, keyword))
|
|
|
.eq(ImGroupMember::getGroupId, params.get("groupId"))
|
|
|
.eq(groupMute != null, ImGroupMember::getGroupMute, groupMute)
|
|
|
.apply(StringUtils.isNotEmpty(groupRoleTypesTr), "find_in_set(group_role_type_,'" + groupRoleTypesTr + "')")
|