|
@@ -196,7 +196,7 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
|
|
|
|
|
|
MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
|
|
|
// 更新学校端乐团主管的群好友列表
|
|
|
- if (musicGroup.getCooperationOrganId() != null) {
|
|
|
+ if (musicGroup != null && musicGroup.getCooperationOrganId() != null) {
|
|
|
// 获取乐团主管
|
|
|
List<SchoolStaff> schoolStaffs = schoolStaffMapper.getByCoopIdAndType(musicGroup.getCooperationOrganId(), ESchoolStaffType.ORCHESTRA_LEADER);
|
|
|
|
|
@@ -218,11 +218,9 @@ public class ImUserFriendServiceImpl extends BaseServiceImpl<Long, ImUserFriend>
|
|
|
userFriends(imUserFriends, musicGroup.getName(), staffUserId, userIds);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- // 更新学校端好友列表
|
|
|
- if (musicGroup.getCooperationOrganId() != null) {
|
|
|
+ // 更新学校端好友列表
|
|
|
imUserFriends.addAll(schoolStaffFriend(musicGroup.getCooperationOrganId()));
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|