diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java b/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java index 3c17c73..1852220 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java @@ -58,7 +58,7 @@ public class SysTenantController { */ @PreAuthorize("@customSs.hasPermission('platform:tenant:list')") @PostMapping("/listByPage") - public R listByPage(SysTenantQueryVo vo) { + public R listByPage(@RequestBody SysTenantQueryVo vo) { IPage page = sysTenantService.selectSysTenantList(vo); IPage voPage = page.convert(u -> { SysTenantReturnVo returnVo = new SysTenantReturnVo(); diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java index ef8d9e9..b0f6927 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java @@ -127,7 +127,7 @@ public class SysTenantServiceImpl extends ServiceImpl selectSysTenantList(SysTenantQueryVo vo) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.orderByDesc(SysTenantEntity::getTenantId); + wrapper.orderByDesc(SysTenantEntity::getCreatedTime); if (StrUtil.isNotBlank(vo.getTenantName())) { wrapper.like(SysTenantEntity::getTenantName, vo.getTenantName()); diff --git a/play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantReturnVo.java index 302f2ec..0c39de0 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantReturnVo.java @@ -91,6 +91,8 @@ public class SysTenantReturnVo { */ private Date tenantTime; + private Date createdTime; + /** * 租户权限标识 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java index 170df4c..c1c8f33 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java @@ -1,5 +1,7 @@ package com.starry.admin.modules.system.controller; +import com.starry.admin.modules.platform.entity.SysTenantEntity; +import com.starry.admin.modules.platform.service.ISysTenantService; import com.starry.admin.utils.SmsUtils; import com.starry.common.result.R; import lombok.extern.slf4j.Slf4j; @@ -22,6 +24,8 @@ import javax.annotation.Resource; public class SysSmsController { @Resource private SmsUtils smsUtils; + @Resource + private ISysTenantService tenantService; @GetMapping("/send") public R sendSms(@RequestParam("phone") String phone) { @@ -29,5 +33,12 @@ public class SysSmsController { return R.ok(); } + @GetMapping("/test") + public R test() { + SysTenantEntity sysTenantEntity = tenantService.selectSysTenantByTenantId("y5PNjqco"); + tenantService.initRole(sysTenantEntity); + return R.ok(true); + } + }