树形添加额外字段
This commit is contained in:
parent
efd38c1c4d
commit
88f21a5d9d
|
@ -21,7 +21,6 @@ import org.dromara.common.redis.utils.CacheUtils;
|
||||||
import org.dromara.system.domain.SysCatalogTextbook;
|
import org.dromara.system.domain.SysCatalogTextbook;
|
||||||
import org.dromara.system.domain.SysOssTextbook;
|
import org.dromara.system.domain.SysOssTextbook;
|
||||||
import org.dromara.system.domain.bo.SysCatalogTextbookBo;
|
import org.dromara.system.domain.bo.SysCatalogTextbookBo;
|
||||||
import org.dromara.system.domain.bo.SysOssResourceBo;
|
|
||||||
import org.dromara.system.domain.vo.SysCatalogTextbookVo;
|
import org.dromara.system.domain.vo.SysCatalogTextbookVo;
|
||||||
import org.dromara.system.mapper.SysCatalogTextbookMapper;
|
import org.dromara.system.mapper.SysCatalogTextbookMapper;
|
||||||
import org.dromara.system.mapper.SysOssTextbookMapper;
|
import org.dromara.system.mapper.SysOssTextbookMapper;
|
||||||
|
@ -81,10 +80,6 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService
|
||||||
Map<String, Object> params = bo.getParams();
|
Map<String, Object> params = bo.getParams();
|
||||||
LambdaQueryWrapper<SysCatalogTextbook> lqw = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<SysCatalogTextbook> lqw = Wrappers.lambdaQuery();
|
||||||
lqw.eq(bo.getParentId() != null, SysCatalogTextbook::getParentId, bo.getParentId());
|
lqw.eq(bo.getParentId() != null, SysCatalogTextbook::getParentId, bo.getParentId());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getAncestors()), SysCatalogTextbook::getAncestors, bo.getAncestors());
|
|
||||||
lqw.like(StringUtils.isNotBlank(bo.getCatalogName()), SysCatalogTextbook::getCatalogName, bo.getCatalogName());
|
|
||||||
lqw.eq(bo.getOrderNum() != null, SysCatalogTextbook::getOrderNum, bo.getOrderNum());
|
|
||||||
//lqw.eq(bo.getType() != null, SysCatalogTextbook::getType, bo.getType());
|
|
||||||
lqw.le(bo.getType() != null, SysCatalogTextbook::getType, bo.getType());
|
lqw.le(bo.getType() != null, SysCatalogTextbook::getType, bo.getType());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
@ -213,7 +208,10 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService
|
||||||
tree.setId(catalog.getCatalogId())
|
tree.setId(catalog.getCatalogId())
|
||||||
.setParentId(catalog.getParentId())
|
.setParentId(catalog.getParentId())
|
||||||
.setName(catalog.getCatalogName())
|
.setName(catalog.getCatalogName())
|
||||||
.setWeight(catalog.getOrderNum()));
|
.setWeight(catalog.getOrderNum())
|
||||||
|
.putExtra("type", catalog.getType())
|
||||||
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue