|
|
@@ -2,6 +2,7 @@ package com.xjrsoft.module.ledger.controller;
|
|
|
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.xjrsoft.common.model.result.RT;
|
|
|
@@ -50,7 +51,10 @@ public class LedgerConfigController {
|
|
|
@SaCheckPermission("ledgerconfig:detail")
|
|
|
public RT<PageOutput<LedgerConfigPageVo>> page(@Valid LedgerConfigPageDto dto){
|
|
|
LambdaQueryWrapper<LedgerConfig> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.orderByDesc(LedgerConfig::getId).select(LedgerConfig.class,x -> VoToColumnUtil.fieldsToColumns(LedgerConfigPageVo.class).contains(x.getProperty()));
|
|
|
+ queryWrapper
|
|
|
+ .like(StrUtil.isNotEmpty(dto.getName()), LedgerConfig::getName, dto.getName())
|
|
|
+ .orderByDesc(LedgerConfig::getId)
|
|
|
+ .select(LedgerConfig.class,x -> VoToColumnUtil.fieldsToColumns(LedgerConfigPageVo.class).contains(x.getProperty()));
|
|
|
IPage<LedgerConfig> page = ledgerConfigService.page(ConventPage.getPage(dto), queryWrapper);
|
|
|
PageOutput<LedgerConfigPageVo> pageOutput = ConventPage.getPageOutput(page, LedgerConfigPageVo.class);
|
|
|
return RT.ok(pageOutput);
|