|
|
|
@ -16,6 +16,7 @@
|
|
|
|
|
*/ |
|
|
|
|
package org.springblade.resource.controller; |
|
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
|
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; |
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@ -27,6 +28,7 @@ import org.springblade.core.cache.utils.CacheUtil;
|
|
|
|
|
import org.springblade.core.mp.support.Condition; |
|
|
|
|
import org.springblade.core.mp.support.Query; |
|
|
|
|
import org.springblade.core.secure.annotation.PreAuth; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
|
import org.springblade.core.tenant.annotation.NonDS; |
|
|
|
|
import org.springblade.core.tool.api.R; |
|
|
|
|
import org.springblade.core.tool.constant.RoleConstant; |
|
|
|
@ -76,7 +78,9 @@ public class OssController extends BladeController {
|
|
|
|
|
@ApiOperationSupport(order = 2) |
|
|
|
|
@ApiOperation(value = "分页", notes = "传入oss") |
|
|
|
|
public R<IPage<OssVO>> list(Oss oss, Query query) { |
|
|
|
|
IPage<Oss> pages = ossService.page(Condition.getPage(query), Condition.getQueryWrapper(oss)); |
|
|
|
|
QueryWrapper<Oss> queryWrapper = Condition.getQueryWrapper(oss); |
|
|
|
|
queryWrapper.eq("tenant_id", AuthUtil.getTenantId()); |
|
|
|
|
IPage<Oss> pages = ossService.page(Condition.getPage(query), queryWrapper); |
|
|
|
|
return R.data(OssWrapper.build().pageVO(pages)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|