diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java index 85d8164..b467754 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java @@ -21,7 +21,6 @@ import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysCatalogTextbook; import org.dromara.system.domain.SysOssTextbook; 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.mapper.SysCatalogTextbookMapper; import org.dromara.system.mapper.SysOssTextbookMapper; @@ -81,10 +80,6 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); 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()); return lqw; } @@ -213,7 +208,10 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService tree.setId(catalog.getCatalogId()) .setParentId(catalog.getParentId()) .setName(catalog.getCatalogName()) - .setWeight(catalog.getOrderNum())); + .setWeight(catalog.getOrderNum()) + .putExtra("type", catalog.getType()) + ); + } /**