Merge branch 'dev_v1.3.8_20221107'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImUserFriendServiceImpl.java

@@ -383,8 +383,13 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
                 case TEACHER:
                     {
                         // 老师查询学生好友
-                        item.friendType(Optional.ofNullable(item.getFriendType()).orElse(ClientEnum.STUDENT))
-                                .setImFriendId(MessageFormat.format("{0}:{1}", String.valueOf(item.getFriendId()), ClientEnum.STUDENT.name()));
+                        if (item.getFriendType() == ClientEnum.TEACHER) {
+                            item.setImFriendId(MessageFormat.format("{0}", String.valueOf(item.getFriendId())));
+                        } else {
+                            item.friendType(Optional.ofNullable(item.getFriendType()).orElse(ClientEnum.STUDENT))
+                                    .setImFriendId(MessageFormat.format("{0}:{1}", String.valueOf(item.getFriendId()), ClientEnum.STUDENT.name()));
+                        }
+
                     }
                     break;
                 case STUDENT:

service.md

@@ -1,7 +1,7 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [x] admin-server
-- [ ] teacher-server
+- [ ] admin-server
+- [x] teacher-server
 - [ ] student-server
 - [ ] website-server
 - [ ] task-server