From 761138a6b36d75c1bc934024485a06cc99a02cc7 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 23 Jul 2024 16:43:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=99=E6=9D=90=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8D=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysOssTextbookServiceImpl.java | 5 +++-- .../main/resources/mapper/system/SysOssTextbookMapper.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index f94e0a4..a9785b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -93,11 +93,11 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { @Override public TableDataInfo queryAwaitPageList(SysOssTextbookBo bo, PageQuery pageQuery) { QueryWrapper wrapper = Wrappers.query(); - wrapper.le("ot.status", 0) .eq("ot.del_flag", 0) .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "ot.file_suffix", bo.getFileSuffix()) .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()) + //.or().like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()) .orderByDesc("ot.create_time"); Page result = baseMapper.selectPageAwaitList(pageQuery.build(), wrapper); return TableDataInfo.build(result); @@ -145,7 +145,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { Integer format = bo.getFormatSuffix(); List list = processFormatSuffixQuery(format); w.in(ArrayUtil.isEmpty(list), "ot.file_suffix", list); - }); + }).orderByAsc("ot.create_time"); return wrapper; } @@ -158,6 +158,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { .eq(ObjectUtil.isNotNull(bo.getCreateBy()), "ot.create_by", bo.getCreateBy()) .eq(ObjectUtil.isNotNull(bo.getOssType()), "ot.oss_type", bo.getOssType()) .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()) + .or().like(StringUtils.isNotEmpty(bo.getFileName()), "u.nick_name", bo.getFileName()) .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { List list = catalogService.selectList(new LambdaQueryWrapper() .select(SysCatalogTextbook::getCatalogId) 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 2e83150..327f296 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 @@ -14,6 +14,7 @@ select ot.*, o.volume from sys_oss_textbook ot left join sys_oss o on o.oss_id = ot.oss_id + left join sys_user u on u.user_id = ot.create_by ${ew.getCustomSqlSegment}