From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
index 58b16e5..1ed526e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
@@ -40,6 +40,8 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -85,8 +87,8 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) throws ParseException {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
return R.data(pages);
@@ -98,7 +100,7 @@
@GetMapping("/select")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "下拉数据源", notes = "传入tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -111,8 +113,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "分页", notes = "传入tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<Tenant>> page(Tenant tenant, Query query) {
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<IPage<Tenant>> page(Tenant tenant, Query query) throws ParseException {
IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
return R.data(pages);
}
@@ -123,7 +125,7 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "新增或修改", notes = "传入tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public R submit(@Valid @RequestBody Tenant tenant) {
return R.status(tenantService.submitTenant(tenant));
}
@@ -135,7 +137,7 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(tenantService.removeTenant(Func.toLongList(ids)));
}
@@ -146,7 +148,7 @@
@PostMapping("/setting")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "授权配置", notes = "传入ids,accountNumber,expireTime")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public R setting(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "账号额度") Integer accountNumber, @ApiParam(value = "过期时间") Date expireTime) {
return R.status(tenantService.setting(accountNumber, expireTime, ids));
}
@@ -171,7 +173,7 @@
@GetMapping("/find-by-name")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "详情", notes = "传入tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> findByName(String name) {
List<Tenant> list = tenantService.list(Wrappers.<Tenant>query().lambda().like(Tenant::getTenantName, name));
return R.data(list);
--
Gitblit v1.9.3