租户

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -269,8 +269,8 @@ public interface ISysClient {
 	@PostMapping(TENANT_ROMOVE)
 	R<Boolean> removeTenant(@RequestParam String ids);
 
-	@PostMapping(TENANT_GETLIST)
-	R<IPage<Tenant>> getTenantList(@RequestBody Map<String, Object> tenant);
+	@GetMapping(TENANT_GETLIST)
+	R<IPage<Tenant>> getTenantList(Tenant tenant,Query query);
 
 	/**
 	 * 获取参数
@@ -303,6 +303,6 @@ public interface ISysClient {
 	 * 前端菜单数据
 	 */
 	@PostMapping(MENU_CUSTOM_ROUTES)
-	List<MenuVO> getCustomRoutes(@RequestBody BladeUser user, @RequestParam Long topMenuId);
+	List<MenuVO> getCustomRoutes(@RequestParam(required = false) Long topMenuId);
 
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -146,7 +146,7 @@ public class ISysClientFallback implements ISysClient {
 	}
 
 	@Override
-	public R<IPage<Tenant>> getTenantList(Map<String, Object> tenant) {
+	public R<IPage<Tenant>> getTenantList(Tenant tenant,Query query) {
 		return null;
 	}
 
@@ -166,7 +166,7 @@ public class ISysClientFallback implements ISysClient {
 	}
 
 	@Override
-	public List<MenuVO> getCustomRoutes(BladeUser user, Long topMenuId) {
+	public List<MenuVO> getCustomRoutes(Long topMenuId) {
 		return null;
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -189,10 +189,9 @@ public class SysClient implements ISysClient {
 	}
 
 	@Override
-	@PostMapping(TENANT_GETLIST)
-	public R<IPage<Tenant>>getTenantList(@RequestBody Map<String, Object> tenant) {
-		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
-		Query query = (Query) tenant.get("query");
+	@GetMapping(TENANT_GETLIST)
+	public R<IPage<Tenant>> getTenantList(Tenant tenant,Query query) {
+		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
 		IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!AuthUtil.getUser().getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, AuthUtil.getUser().getTenantId()) : queryWrapper);
 		return R.data(pages);
 	}
@@ -221,7 +220,8 @@ public class SysClient implements ISysClient {
 	 */
 	@Override
 	@PostMapping(MENU_CUSTOM_ROUTES)
-	public List<MenuVO> getCustomRoutes(@RequestBody BladeUser user, @RequestParam Long topMenuId) {
+	public List<MenuVO> getCustomRoutes(@RequestParam(required = false) Long topMenuId) {
+		BladeUser user = AuthUtil.getUser();
 		List<MenuVO> list = menuService.getCustomRoutes((user == null) ? null : user.getRoleId(), topMenuId);
 		return list;
 	}