Merge branch 'develop' of http://git.dayaedu.com/yonge/cooleshow into develop

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

@@ -166,8 +166,7 @@ public class StudentController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -145,8 +145,7 @@ public class TeacherController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -290,8 +290,7 @@ public class TenantActivationCodeController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -114,8 +114,7 @@ public class TenantAlbumPurchaseController extends BaseController {
         if (tenantStaff == null) {
             throw new BizException("非法请求");
         }
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getId, tenantStaff.getTenantId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -166,8 +166,7 @@ public class StudentController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -145,8 +145,7 @@ public class TeacherController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -301,8 +301,7 @@ public class TenantActivationCodeController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -109,8 +109,7 @@ public class TenantAlbumController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

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

@@ -114,8 +114,7 @@ public class TenantAlbumPurchaseController extends BaseController {
         if (tenantStaff == null) {
             throw new BizException("非法请求");
         }
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getId, tenantStaff.getTenantId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }