irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-07-31 13:51:37 +08:00
parent 3360208277
commit 369493769a
4 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/platform/controller/SysTenantController.java
View File

@@ -58,7 +58,7 @@ public class SysTenantController {
*/ */
@PreAuthorize("@customSs.hasPermission('platform:tenant:list')") @PreAuthorize("@customSs.hasPermission('platform:tenant:list')")
@PostMapping("/listByPage") @PostMapping("/listByPage")
public R listByPage(SysTenantQueryVo vo) { public R listByPage(@RequestBody SysTenantQueryVo vo) {
IPage<SysTenantEntity> page = sysTenantService.selectSysTenantList(vo); IPage<SysTenantEntity> page = sysTenantService.selectSysTenantList(vo);
IPage<SysTenantReturnVo> voPage = page.convert(u -> { IPage<SysTenantReturnVo> voPage = page.convert(u -> {
SysTenantReturnVo returnVo = new SysTenantReturnVo(); SysTenantReturnVo returnVo = new SysTenantReturnVo();

2
play-admin/src/main/java/com/starry/admin/modules/platform/service/impl/SysTenantServiceImpl.java
View File

@@ -127,7 +127,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
@Override @Override
public IPage<SysTenantEntity> selectSysTenantList(SysTenantQueryVo vo) { public IPage<SysTenantEntity> selectSysTenantList(SysTenantQueryVo vo) {
LambdaQueryWrapper<SysTenantEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysTenantEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.orderByDesc(SysTenantEntity::getTenantId); wrapper.orderByDesc(SysTenantEntity::getCreatedTime);
if (StrUtil.isNotBlank(vo.getTenantName())) { if (StrUtil.isNotBlank(vo.getTenantName())) {
wrapper.like(SysTenantEntity::getTenantName, vo.getTenantName()); wrapper.like(SysTenantEntity::getTenantName, vo.getTenantName());

2
play-admin/src/main/java/com/starry/admin/modules/platform/vo/SysTenantReturnVo.java
View File

@@ -91,6 +91,8 @@ public class SysTenantReturnVo {
*/ */
private Date tenantTime; private Date tenantTime;
private Date createdTime;
/** /**
* 租户权限标识 * 租户权限标识
*/ */

11
play-admin/src/main/java/com/starry/admin/modules/system/controller/SysSmsController.java
View File

@@ -1,5 +1,7 @@
package com.starry.admin.modules.system.controller; 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.admin.utils.SmsUtils;
import com.starry.common.result.R; import com.starry.common.result.R;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -22,6 +24,8 @@ import javax.annotation.Resource;
public class SysSmsController { public class SysSmsController {
@Resource @Resource
private SmsUtils smsUtils; private SmsUtils smsUtils;
@Resource
private ISysTenantService tenantService;
@GetMapping("/send") @GetMapping("/send")
public R sendSms(@RequestParam("phone") String phone) { public R sendSms(@RequestParam("phone") String phone) {
@@ -29,5 +33,12 @@ public class SysSmsController {
return R.ok(); return R.ok();
} }
@GetMapping("/test")
public R test() {
SysTenantEntity sysTenantEntity = tenantService.selectSysTenantByTenantId("y5PNjqco");
tenantService.initRole(sysTenantEntity);
return R.ok(true);
}
} }