Merge branch 'feature/0803-im'

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

@@ -81,7 +81,7 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
         }
         Date date = new Date();
         //是否自动通过审核
-        imGroupMemberAudit.setAuditStatus(imGroup.getAutoPassFlag()?AuditStatusEnum.OPEN:AuditStatusEnum.AUDITING);
+        imGroupMemberAudit.setAuditStatus(imGroup.getAutoPassFlag() && autoJoin?AuditStatusEnum.OPEN:AuditStatusEnum.AUDITING);
         imGroupMemberAudit.setUpdateTime(date);
         imGroupMemberAudit.setCreateTime(date);
         baseMapper.insert(imGroupMemberAudit);

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

@@ -173,7 +173,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
                     ImGroupWrapper.ImGroup imGroup = new ImGroupWrapper.ImGroup();
                     imGroup.setName(MessageFormat.format("{0}的粉丝群", teacher.getUsername()));
                     imGroup.setIntroduce("");
-                    imGroup.setAutoPassFlag(true);
+                    imGroup.setAutoPassFlag(false);
                     imGroup.setCreateBy(teacher.getUserId());
 
                     imGroupService.create(imGroup);