|
|
@ -10,7 +10,9 @@ import com.cloud.kicc.common.core.api.R; |
|
|
|
import com.cloud.kicc.common.core.constant.AppConstants; |
|
|
|
import com.cloud.kicc.common.core.constant.AppConstants; |
|
|
|
import com.cloud.kicc.common.data.entity.KiccUser; |
|
|
|
import com.cloud.kicc.common.data.entity.KiccUser; |
|
|
|
import com.cloud.kicc.common.log.annotation.SysLog; |
|
|
|
import com.cloud.kicc.common.log.annotation.SysLog; |
|
|
|
|
|
|
|
import com.cloud.kicc.common.security.annotation.Inner; |
|
|
|
import com.cloud.kicc.common.security.util.SecurityUtils; |
|
|
|
import com.cloud.kicc.common.security.util.SecurityUtils; |
|
|
|
|
|
|
|
import com.cloud.kicc.commonbiz.api.entity.MapTaskPreset; |
|
|
|
import com.cloud.kicc.system.api.entity.RoleTenant; |
|
|
|
import com.cloud.kicc.system.api.entity.RoleTenant; |
|
|
|
import com.cloud.kicc.system.api.entity.Tenant; |
|
|
|
import com.cloud.kicc.system.api.entity.Tenant; |
|
|
|
import com.cloud.kicc.system.service.RoleTenantService; |
|
|
|
import com.cloud.kicc.system.service.RoleTenantService; |
|
|
@ -48,12 +50,17 @@ public class TenantController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/list") |
|
|
|
@GetMapping("/list") |
|
|
|
//@PreAuthorize("@pms.hasPermission('tenant_view')")
|
|
|
|
|
|
|
|
public R list(Page page, Tenant tenant) { |
|
|
|
public R list(Page page, Tenant tenant) { |
|
|
|
IPage<Tenant> tenantPage = tenantService.page(page, getQueryWrapper(tenant)); |
|
|
|
IPage<Tenant> tenantPage = tenantService.page(page, getQueryWrapper(tenant)); |
|
|
|
return R.ok(tenantPage.getRecords(), tenantPage.getTotal()); |
|
|
|
return R.ok(tenantPage.getRecords(), tenantPage.getTotal()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Inner(false) |
|
|
|
|
|
|
|
@GetMapping("/loginTenantList") |
|
|
|
|
|
|
|
public R loginTenantList() { |
|
|
|
|
|
|
|
return R.ok(tenantService.list()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/currentUserTenantList") |
|
|
|
@GetMapping("/currentUserTenantList") |
|
|
|
@PreAuthorize("@pms.hasPermission('tenant_view')") |
|
|
|
@PreAuthorize("@pms.hasPermission('tenant_view')") |
|
|
|
public R currentUserTenantList() { |
|
|
|
public R currentUserTenantList() { |
|
|
|