Commit 03235e5769bc9263072320c60e77c841dc67bfaa
1 parent
d9d1b620
fix: [DEFECT-787] query params name renamed to textSearch
Showing
1 changed file
with
2 additions
and
3 deletions
| @@ -24,7 +24,6 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. | @@ -24,7 +24,6 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant. | ||
| 24 | @RequiredArgsConstructor | 24 | @RequiredArgsConstructor |
| 25 | public class TkTenantProfilesController extends BaseController { | 25 | public class TkTenantProfilesController extends BaseController { |
| 26 | 26 | ||
| 27 | - | ||
| 28 | @PreAuthorize("@check.checkPermissions({'SYS_ADMIN'},{})") | 27 | @PreAuthorize("@check.checkPermissions({'SYS_ADMIN'},{})") |
| 29 | @GetMapping( | 28 | @GetMapping( |
| 30 | name = "page", | 29 | name = "page", |
| @@ -32,7 +31,7 @@ public class TkTenantProfilesController extends BaseController { | @@ -32,7 +31,7 @@ public class TkTenantProfilesController extends BaseController { | ||
| 32 | public YtPageData<TenantProfile> pageDevice( | 31 | public YtPageData<TenantProfile> pageDevice( |
| 33 | @RequestParam(PAGE_SIZE) int pageSize, | 32 | @RequestParam(PAGE_SIZE) int pageSize, |
| 34 | @RequestParam(PAGE) int page, | 33 | @RequestParam(PAGE) int page, |
| 35 | - @RequestParam(value = "name", required = false) String name, | 34 | + @RequestParam(value = "textSearch", required = false) String textSearch, |
| 36 | @RequestParam(value = ORDER_FILED, required = false) String orderBy, | 35 | @RequestParam(value = ORDER_FILED, required = false) String orderBy, |
| 37 | @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) | 36 | @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType) |
| 38 | throws ThingsboardException { | 37 | throws ThingsboardException { |
| @@ -42,7 +41,7 @@ public class TkTenantProfilesController extends BaseController { | @@ -42,7 +41,7 @@ public class TkTenantProfilesController extends BaseController { | ||
| 42 | createPageLink( | 41 | createPageLink( |
| 43 | pageSize, | 42 | pageSize, |
| 44 | page, | 43 | page, |
| 45 | - name, | 44 | + textSearch, |
| 46 | orderBy, | 45 | orderBy, |
| 47 | null == orderType ? OrderTypeEnum.DESC.name() : orderType.name()); | 46 | null == orderType ? OrderTypeEnum.DESC.name() : orderType.name()); |
| 48 | PageData<TenantProfile> tenantProfilePageData = | 47 | PageData<TenantProfile> tenantProfilePageData = |