|  | @@ -304,7 +304,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public List<ImGroup> queryByUserId(Integer userId, String search,String groupType) {
 | 
	
		
			
				|  |  | -        List<ImGroup> imGroups = imGroupDao.queryByUserId(userId, search, groupType);
 | 
	
		
			
				|  |  | +        List<ImGroup> imGroups = imGroupDao.queryByUserId(userId, search, groupType).stream()
 | 
	
		
			
				|  |  | +            .filter(Objects::nonNull).collect(Collectors.toList());
 | 
	
		
			
				|  |  |          for (ImGroup item : imGroups) {
 | 
	
		
			
				|  |  |              if (Objects.nonNull(item.getGroupType()) && StringUtils.isBlank(item.getImg())) {
 | 
	
		
			
				|  |  |                  item.setImg(item.getGroupType().getAvatar());
 | 
	
	
		
			
				|  | @@ -492,7 +493,8 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          List<String> imGroupIds = imGroupMembers.stream().map(ImGroupMember::getImGroupId).collect(Collectors.toList());
 | 
	
		
			
				|  |  |          // 群组没人,删除群组
 | 
	
		
			
				|  |  | -        List<ImGroup> imGroups = imGroupDao.queryByUserId(userId.intValue(),null, ImGroup.GroupTypeEnum.SCHOOL.getCode());
 | 
	
		
			
				|  |  | +        List<ImGroup> imGroups = imGroupDao.queryByUserId(userId.intValue(),null, ImGroup.GroupTypeEnum.SCHOOL.getCode()).stream()
 | 
	
		
			
				|  |  | +            .filter(Objects::nonNull).collect(Collectors.toList());
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          imGroupMemberDao.deleteByUserId(userId);
 |