|
|
@@ -63,20 +63,11 @@ public class CorpsDescController extends BladeController {
|
|
|
@GetMapping("/list")
|
|
|
@ApiOperationSupport(order = 2)
|
|
|
@ApiOperation(value = "分页", notes = "传入corpsDesc")
|
|
|
- public R<IPage<CorpsDesc>> list(CorpsDescVO corpsDesc, Query query) {
|
|
|
- LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper=new LambdaQueryWrapper<>();
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getCode()),CorpsDesc::getCode,corpsDesc.getCode());
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getCname()),CorpsDesc::getCname,corpsDesc.getCname());
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getBelongtoarea()),CorpsDesc::getBelongtoarea,corpsDesc.getBelongtoarea());
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getBelongtocompany()),CorpsDesc::getBelongtocompany,corpsDesc.getBelongtocompany());
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getAttn()),CorpsDesc::getAttn,corpsDesc.getAttn());
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getGoodtypes()),CorpsDesc::getGoodtypes,corpsDesc.getGoodtypes());
|
|
|
- lambdaQueryWrapper.like(StringUtils.isNotBlank(corpsDesc.getCreditLevel()),CorpsDesc::getCreditLevel,corpsDesc.getCreditLevel());
|
|
|
- lambdaQueryWrapper.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId());
|
|
|
- lambdaQueryWrapper.eq(CorpsDesc::getIsDeleted,0);
|
|
|
- IPage<CorpsDesc> page = new Page<>(query.getCurrent(),query.getSize());
|
|
|
- IPage<CorpsDesc> iPage = corpsDescService.page(page, lambdaQueryWrapper);
|
|
|
- return R.data(iPage);
|
|
|
+ public R<IPage<CorpsDescVO>> list(CorpsDescVO corpsDesc, Query query) {
|
|
|
+ corpsDesc.setIsDeleted(0);//默认查有效的
|
|
|
+ corpsDesc.setTenantId(SecureUtil.getTenantId());
|
|
|
+ IPage<CorpsDescVO> pages = corpsDescService.selectCorpsDescPage(Condition.getPage(query), corpsDesc);
|
|
|
+ return R.data(pages);
|
|
|
}
|
|
|
|
|
|
/**
|
lazhaoqian