Merge branch 'groupNickName' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.dto.ImUserFriendDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -76,7 +77,19 @@ public class ImGroupController extends BaseController {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 
-		return succeed(imUserFriendService.queryFriendDetail(sysUser.getId(), userId));
+		ImUserFriendDto dto = imUserFriendService.queryFriendDetail(sysUser.getId(), userId);
+		if (dto == null) {
+			dto = new ImUserFriendDto();
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			dto.setFriend(user);
+			if (user.getUserType().contains("STUDENT")) {
+				dto.setFriendNickname(user.getUsername());
+			} else {
+				dto.setFriendNickname(user.getRealName());
+			}
+			dto.setFriendId(userId);
+		}
+		return succeed(dto);
 	}
 
 	@ApiOperation("查询好友列表")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -90,10 +90,10 @@ public class ImGroupController extends BaseController {
 			dto = new ImUserFriendDto();
 			SysUser user = sysUserFeignService.queryUserById(userId);
 			dto.setFriend(user);
-			if (user.getUserType().contains("TEACHER")) {
-				dto.setFriendNickname(user.getRealName());
-			} else {
+			if (user.getUserType().contains("STUDENT")) {
 				dto.setFriendNickname(user.getUsername());
+			} else {
+				dto.setFriendNickname(user.getRealName());
 			}
 			dto.setFriendId(userId);
 		}