|
@@ -25,10 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
-import java.util.UUID;
|
|
|
+import java.util.*;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -169,7 +166,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
|
|
|
|
|
|
@Override
|
|
|
public ImGroupMemberDto queryMember(String imGroupId, Integer userId) {
|
|
|
- return imGroupDao.queryMember(imGroupId, userId);
|
|
|
+ ImGroupMemberDto imGroupMemberDto = imGroupDao.queryMember(imGroupId, userId);
|
|
|
+ if(Objects.isNull(imGroupMemberDto)){
|
|
|
+ imGroupMemberDto = imGroupDao.queryMember(null, userId);
|
|
|
+ if (Objects.nonNull(imGroupMemberDto)){
|
|
|
+ imGroupMemberDto.setRoleType(null);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return imGroupMemberDto;
|
|
|
}
|
|
|
|
|
|
@Override
|