🎉 2.0.0.RC6

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -84,7 +84,7 @@ public class DeptController extends BladeController {
 	 */
 	@GetMapping("/tree")
 	@ApiOperation(value = "树形结构", notes = "树形结构", position = 3)
-	public R<List<DeptVO>> tree(String tenantCode) {
+	public R<List<DeptVO>> tree(@RequestParam(defaultValue = BladeConstant.ADMIN_TENANT_CODE) String tenantCode) {
 		List<DeptVO> tree = deptService.tree(tenantCode);
 		return R.data(tree);
 	}

blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java

@@ -82,7 +82,7 @@ public class RoleController extends BladeController {
 	 */
 	@GetMapping("/tree")
 	@ApiOperation(value = "树形结构", notes = "树形结构", position = 3)
-	public R<List<RoleVO>> tree(String tenantCode) {
+	public R<List<RoleVO>> tree(@RequestParam(defaultValue = BladeConstant.ADMIN_TENANT_CODE) String tenantCode) {
 		List<RoleVO> tree = roleService.tree(tenantCode);
 		return R.data(tree);
 	}

blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -81,8 +81,9 @@ public class TenantController extends BladeController {
 	 */
 	@GetMapping("/select")
 	@ApiOperation(value = "下拉数据源", notes = "传入tenant", position = 3)
-	public R<List<Tenant>> select(Tenant tenant) {
+	public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
-		List<Tenant> list = tenantService.list(Condition.getQueryWrapper(tenant));
+		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
+		List<Tenant> list = tenantService.list((!bladeUser.getTenantCode().equals(BladeConstant.ADMIN_TENANT_CODE)) ? queryWrapper.lambda().eq(Tenant::getTenantCode, bladeUser.getTenantCode()) : queryWrapper);
 		return R.data(list);
 	}
 

script/docker/docker-compose.yml

@@ -3,7 +3,7 @@ services:
 
   blade-nginx:
     image: nginx:stable-alpine-perl
-    hostname: "consul-nginx"
+    hostname: "blade-nginx"
     ports:
     - 8500:8500
     - 88:88