Merge branch 'feature/0721-tenant' into develop

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

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

@@ -472,7 +472,6 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void dismiss(String groupId) throws Exception {
        imGroupCoreService.groupDismiss(groupId);
     }

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

@@ -1008,7 +1008,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         return wrapper;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+//    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateTenant(TeacherWrapper.UpdateTenant updateTenant) {
         Teacher teacher = this.getById(updateTenant.getTeacherId());

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

@@ -339,6 +339,7 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
             } catch (Exception e) {
                 log.error("机构入驻审核极光消息推送异常");
             }
+        } else {
             try {
                 String serviceConfig = sysConfigService.findConfigValue(SysConfigConstant.CUSTOMER_SERVICE_PHONE);
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantUnbindRecordMapper.xml

@@ -31,15 +31,14 @@
         ,su.avatar_ as avatar
         FROM tenant_unbind_record t
         LEFT JOIN tenant_info ti ON ti.id_ = t.tenant_id_
-        LEFT JOIN sys_user su on su.id_ = t.user_id_
         <where>
             <if test="param.keyword != null and param.keyword.trim() != ''">
                 AND (
+                t.username_ like concat ('%',#{param.keyword},'%') or
+                t.phone_ like concat ('%',#{param.keyword},'%') or
                 ti.name_ like concat ('%',#{param.keyword},'%') or
                 ti.username_ like concat ('%',#{param.keyword},'%') or
-                ti.phone_ like concat ('%',#{param.keyword},'%') or
-                su.username_ like concat ('%',#{param.keyword},'%') or
-                su.phone_ like concat ('%',#{param.keyword},'%')
+                ti.phone_ like concat ('%',#{param.keyword},'%')
                 )
             </if>
             <if test="param.userType != null">

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -239,7 +239,7 @@ public class TeacherController extends BaseController {
         tenantUnbindRecord.setTenantId(user.getTenantId());
         tenantUnbindRecord.setTenantName(tenantInfo == null ? "" : tenantInfo.getName());
         tenantUnbindRecord.setUserId(user.getId());
-        tenantUnbindRecord.setUserName(user.getRealName());
+        tenantUnbindRecord.setUserName(user.getUsername());
         tenantUnbindRecord.setPhone(user.getPhone());
 
         String subjectId = teacher.getSubjectId();