diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java index 68adf8c..0519abd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java @@ -26,6 +26,7 @@ public interface SysOssTextbookMapper extends BaseMapperPlus selectPageList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + Page selectPageList4School(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 45ceca2..48dbac5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -128,7 +128,10 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService lqw.like(bo.getParentId() != null, SysCatalogResource::getAncestors, bo.getParentId()); lqw.eq(bo.getType() != null, SysCatalogResource::getType, bo.getType()); lqw.eq(SysCatalogResource::getDelFlag, 0); + lqw.orderByAsc(SysCatalogResource::getAncestors); + lqw.orderByAsc(SysCatalogResource::getParentId); lqw.orderByAsc(SysCatalogResource::getOrderNum); + lqw.orderByAsc(SysCatalogResource::getCatalogId); return lqw; } 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 0779c24..ed5951a 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 @@ -91,7 +91,11 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService lqw.like(bo.getParentId() != null, SysCatalogTextbook::getAncestors, bo.getParentId()); lqw.le(bo.getType() != null, SysCatalogTextbook::getType, bo.getType()); lqw.eq(SysCatalogTextbook::getDelFlag, 0); + lqw.orderByAsc(SysCatalogTextbook::getAncestors); + lqw.orderByAsc(SysCatalogTextbook::getParentId); lqw.orderByAsc(SysCatalogTextbook::getOrderNum); + lqw.orderByAsc(SysCatalogTextbook::getCatalogId); + //lqw.orderByAsc(SysCatalogTextbook::getOrderNum); return lqw; } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml index 956d480..2e83150 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml @@ -10,7 +10,7 @@ ${ew.getCustomSqlSegment} - select ot.*, o.volume from sys_oss_textbook ot left join sys_oss o on o.oss_id = ot.oss_id