|
@@ -230,15 +230,16 @@ public class ImGroupMemberServiceImpl extends ServiceImpl<ImGroupMemberDao, ImGr
|
|
|
public List<ImGroupMember> findChatGroupAllMemberInfo(Map<String, Object> params) {
|
|
|
|
|
|
Object search = params.get("search");
|
|
|
- Object groupMute = params.get("groupMute");
|
|
|
- Object groupRoleTypes = params.get("groupRoleTypes");
|
|
|
+ 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))
|
|
|
- .eq(ImGroupMember::getGroupId,params.get("groupId"))
|
|
|
- .eq(groupMute != null,ImGroupMember::getGroupMute,Boolean.valueOf(groupMute.toString()))
|
|
|
- .apply(groupRoleTypes != null, "find_in_set(group_role_type_,'"+(((List)groupRoleTypes).stream().map(r->r.toString()).collect(Collectors.joining(",")))+"')")
|
|
|
+ .eq(ImGroupMember::getGroupId, params.get("groupId"))
|
|
|
+ .eq(groupMute != null, ImGroupMember::getGroupMute, groupMute)
|
|
|
+ .apply(StringUtils.isNotEmpty(groupRoleTypesTr), "find_in_set(group_role_type_,'" + groupRoleTypesTr + "')")
|
|
|
.orderByDesc(ImGroupMember::getId));
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(members)) {
|