消息通知

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -574,7 +574,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 	public boolean updateRoleType(String imGroupId, Integer userId, String roleType) {
 		List<Integer> userIdList = new ArrayList<Integer>();
 		userIdList.add(userId);
-		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId.toString(), userIdList.stream().map(Objects::toString)
+		List<ImGroupMember> imGroupMemberList = imGroupMemberDao.queryByImGroupIdAndUserId(imGroupId, userIdList.stream().map(Objects::toString)
 				.collect(Collectors.joining(",")));
 
 		if (CollectionUtils.isEmpty(imGroupMemberList)) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupServiceImpl.java

@@ -574,13 +574,14 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             ImGroupMember imGroupMember = new ImGroupMember();
             imGroupMember.setImGroupId(imGroup.getId());
             imGroupMember.setUserId(userId);
-            imGroupMember.setIsAdmin(schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER));
             imGroupMember.setRoleType(schoolStaffType.getDescribe());
             imGroupMember.setNickname(name);
             if (StringUtils.isNotEmpty(schoolStaffType.getDescribe())) {
                 imGroupMember.setType(EFriendRoleType.getByName(schoolStaffType.getDescribe()).name());
             }
             imGroupMember.setTenantId(imGroup.getTenantId());
+            imGroupMemberService.initImGroupMember(imGroupMember,imGroup.getGroupType());
+
             ImGroupMemberWrapper.ImGroupMember groupMember = new ImGroupMemberWrapper.ImGroupMember();
             groupMember.setUserId(userId.longValue());
             groupMember.setImUserId(userId.toString());
@@ -593,9 +594,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             groupMember.setIsAdmin(imGroupMember.getIsAdmin());
             imGroupCoreService.groupMemberJoin(imGroup.getId(), Lists.newArrayList(groupMember));
             // 更新群主流程
-            if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
+            /*if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
                 groupChangeOwner(userId, imGroup.getId());
-            }
+            }*/
             imGroupMemberDao.insert(imGroupMember);
 
         }