Merge branch 'feature/1019-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -92,7 +92,7 @@ public class IndexController extends BaseController {
 
         String format = new SimpleDateFormat("yyyyMMddHHmm").format(new Date());
         OssFileWrapper.ExportFile exportFile = ossFileService.uploadFile(templates,
-                TeacherWrapper.ExportTeacherTemplate.class, format, "练习统计列表");
+                SysMusicCompareRecordQueryInfo.WechatCompareRecordExportDto.class, format, "练习统计列表");
         return succeed(exportFile);
     }
 

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

@@ -146,7 +146,7 @@ public class StudentController extends BaseController {
                     vo.setUserStatus(UserStatusEnum.NORMAL);
                 }
             }
-            vo.setTenantGroupName(tenantGroupIdNameMap.getOrDefault(vo.getTenantId(), ""));
+            vo.setTenantGroupName(tenantGroupIdNameMap.getOrDefault(vo.getTenantGroupId(), ""));
         }
         return succeed(PageUtil.pageInfo(pages));
     }

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

@@ -413,6 +413,9 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
                         .set(TenantGroup::getImGroupId, null)
                         .eq(TenantGroup::getId, detail.getTenantGroupId())
                         .update();
+                studentDao.update(null, Wrappers.<Student>lambdaUpdate()
+                        .eq(Student::getTenantGroupId, detail.getTenantGroupId())
+                        .set(Student::getTenantGroupId, null));
             }
         }
         return true;

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

@@ -144,7 +144,7 @@ public class StudentController extends BaseController {
                     vo.setUserStatus(UserStatusEnum.NORMAL);
                 }
             }
-            vo.setTenantGroupName(tenantGroupIdNameMap.getOrDefault(vo.getTenantId(), ""));
+            vo.setTenantGroupName(tenantGroupIdNameMap.getOrDefault(vo.getTenantGroupId(), ""));
         }
         return succeed(PageUtil.pageInfo(pages));
     }