|  | @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiImplicitParam;
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiImplicitParams;
 |  |  import io.swagger.annotations.ApiImplicitParams;
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiOperation;
 |  |  import io.swagger.annotations.ApiOperation;
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiParam;
 |  |  import io.swagger.annotations.ApiParam;
 | 
											
												
													
														|  | 
 |  | +import org.jetbrains.annotations.NotNull;
 | 
											
												
													
														|  |  import org.springframework.beans.factory.annotation.Autowired;
 |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
											
												
													
														|  |  import org.springframework.web.bind.annotation.PathVariable;
 |  |  import org.springframework.web.bind.annotation.PathVariable;
 | 
											
												
													
														|  |  import org.springframework.web.bind.annotation.PostMapping;
 |  |  import org.springframework.web.bind.annotation.PostMapping;
 | 
											
										
											
												
													
														|  | @@ -115,17 +116,7 @@ public class ImUserFriendController extends BaseController {
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |          // 用户ID
 |  |          // 用户ID
 | 
											
												
													
														|  | -        long id = Long.parseLong(imGroupService.analysisImUserId(userId));
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -        SysUser byUserId = sysUserMapper.getByUserId(id);
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -        ImUserFriendVO.ImMessageUser imMessageUser = new ImUserFriendVO.ImMessageUser();
 |  | 
 | 
											
												
													
														|  | -        imMessageUser.setImUserId(userId);
 |  | 
 | 
											
												
													
														|  | -        imMessageUser.setDelFlag(true);
 |  | 
 | 
											
												
													
														|  | -        if (byUserId !=null) {
 |  | 
 | 
											
												
													
														|  | -            imMessageUser.setUserId(byUserId.getId());
 |  | 
 | 
											
												
													
														|  | -            imMessageUser.setDelFlag(byUserId.getDelFlag());
 |  | 
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | 
 |  | +        ImUserFriendVO.ImMessageUser imMessageUser = imUserFriendService.getImMessageUser(userId);
 | 
											
												
													
														|  |          return succeed(imMessageUser);
 |  |          return succeed(imMessageUser);
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      }
 |  |      }
 |