Merge branch 'feature/1019-tenant' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantGroupController.java

@@ -56,6 +56,7 @@ public class TenantGroupController {
             return R.from(new TenantGroupWrapper.TenantGroup());
         }
         TenantGroupWrapper.TenantGroup group = TenantGroupWrapper.TenantGroup.from(JSON.toJSONString(wrapper));
+        group.setImGroupExist(false);
         if (StringUtils.isNotEmpty(wrapper.getImGroupId())) {
             ImGroup imGroup = imGroupService.getById(wrapper.getImGroupId());
             if (imGroup != null) {

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

@@ -670,14 +670,14 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             imUserFriendService.delTeacherFriendByTenantId(student.getTenantId(), student.getUserId(),
                     ClientEnum.STUDENT.getCode());
 
-            // 与新机构老师成为好友
-            if (newTenantId != -1L) {
-                // 自动与机构老师成为好友
-                QueryWrapper<Teacher> queryWrapper = new QueryWrapper<>();
-                queryWrapper.lambda().eq(Teacher::getTenantId, newTenantId);
-                List<Teacher> teacherList = teacherDao.selectList(queryWrapper);
-                teacherList.forEach(next -> imUserFriendService.saveUserFriend(next.getUserId(),
-                        new HashSet<>(ImmutableList.of(student.getUserId()))));
+            // 加好友
+            QueryWrapper<Teacher> query = new QueryWrapper<>();
+            query.lambda().eq(Teacher::getTenantId, newTenantId);
+            List<Teacher> teachers = teacherDao.selectList(query);
+            for (Teacher teacher : teachers) {
+                HashSet<Long> studentIds = new HashSet<>();
+                studentIds.add(student.getUserId());
+                imUserFriendService.saveUserFriend(teacher.getUserId(), studentIds);
             }
         }
 

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

@@ -367,8 +367,8 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
         List<Long> tenantGroupIds =
                 details.stream().map(TenantGroupWrapper.AdjustTenantGroupDetail::getTenantGroupId).collect(Collectors.toList());
         List<TenantGroup> tenantGroups = this.lambdaQuery().in(TenantGroup::getId, tenantGroupIds).list();
-        Map<Long, String> groupBy = tenantGroups.stream().collect(Collectors.toMap(TenantGroup::getId,
-                TenantGroup::getImGroupId));
+        Map<Long, String> groupBy = tenantGroups.stream().filter(next -> next.getImGroupId() != null)
+                .collect(Collectors.toMap(TenantGroup::getId, TenantGroup::getImGroupId));
         for (TenantGroupWrapper.AdjustTenantGroupDetail detail : details) {
             Long toTeacher = detail.getTeacherId();
             if (teacherId.equals(toTeacher) && Boolean.FALSE.equals(detail.getDismiss())) {

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantGroupController.java

@@ -57,6 +57,7 @@ public class TenantGroupController {
             return R.from(new TenantGroupWrapper.TenantGroup());
         }
         TenantGroupWrapper.TenantGroup group = TenantGroupWrapper.TenantGroup.from(JSON.toJSONString(wrapper));
+        group.setImGroupExist(false);
         if (StringUtils.isNotEmpty(wrapper.getImGroupId())) {
             ImGroup imGroup = imGroupService.getById(wrapper.getImGroupId());
             if (imGroup != null) {