Merge branch 'feature/0427-school' into master_saas

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

@@ -365,7 +365,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setName("教学团队衔接群");
             imGroup.setIntroduce(imGroup.getName());
             imGroup.setMemo(cooperationOrgan.getName());
-            imGroup.setMemberNum(1);
+            imGroup.setMemberNum(0);
             imGroup.setType(ImGroup.GroupTypeEnum.SCHOOL.getCode());
             imGroup.setGroupType(ImGroup.GroupTypeEnum.SCHOOL);
             imGroup.setCreateTime(new Date());
@@ -373,17 +373,15 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setTenantId(TenantContextHolder.getTenantId());
             imGroupDao.insert(imGroup);
             imPluginService.groupCreate(imGroup.getId(), imGroup.getName(), userId.toString());
-        } else {
+        }
+        imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), ImGroupMemberWrapper.ImGroupMember.builder()
+                .userId(userId.longValue()).imUserIdFormat(false).build());
 
-            if (!schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
-                imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), ImGroupMemberWrapper.ImGroupMember.builder()
-                        .userId(userId.longValue()).imUserIdFormat(false).build());
-            } else {
-                groupChangeOwner(userId, imGroup.getId());
-            }
-            imGroup.setMemberNum(imGroup.getMemberNum() + 1);
-            imGroupDao.update(imGroup);
+        if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
+            groupChangeOwner(userId, imGroup.getId());
         }
+        imGroup.setMemberNum(imGroup.getMemberNum() + 1);
+        imGroupDao.update(imGroup);
         ImGroupMember imGroupMember = new ImGroupMember();
         imGroupMember.setImGroupId(imGroup.getId());
         imGroupMember.setUserId(userId);
@@ -422,9 +420,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     /**
      * 加群
      *
-     * @param imGroupIds 群组ID
+     * @param imGroupIds    群组ID
      * @param user          用户信息
-     * @param userType
+     * @param userType      用户类型
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -440,7 +438,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<ImGroup> groupList = imGroupDao.getByIds(imGroupIds);
 
         // id 分组
-        Map<String, ImGroup> map = groupList.stream().collect(Collectors.toMap(o -> o.getId(), Function.identity()));
+        Map<String, ImGroup> map = groupList.stream().collect(Collectors.toMap(ImGroup::getId, Function.identity()));
 
 
         for (String musicGroupId : imGroupIds) {
@@ -449,7 +447,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                 continue;
             }
             try {
-                imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), ImGroupMemberWrapper.ImGroupMember.builder().userId(user.getId().longValue()).build());
+                imPluginService.groupJoin(imGroup.getId(), imGroup.getName(), ImGroupMemberWrapper.ImGroupMember.builder()
+                        .userId(user.getId().longValue())
+                        .imUserIdFormat(false).build());
 
                 ImGroupMember imGroupMember = new ImGroupMember();
                 imGroupMember.setImGroupId(imGroup.getId());