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 e9a52ae..08fa0b8 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 @@ -80,7 +80,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { wrapper.le("ot.status", 0) .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "ot.file_suffix", bo.getFileSuffix()) .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()) - .and(ObjectUtil.isNotNull(bo.getFormatSuffix()), w -> { + .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { List list = catalogService.selectList(new LambdaQueryWrapper() .select(SysCatalogTextbook::getCatalogId) .apply(DataBaseHelper.findInSet(bo.getCatalogId(), "ancestors"))); @@ -111,7 +111,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { .eq(ObjectUtil.isNotNull(bo.getStatus()), "ot.status", bo.getStatus()) .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "ot.file_suffix", bo.getFileSuffix()) .like(StringUtils.isNotEmpty(bo.getFileName()), "ot.file_name", bo.getFileName()) - .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { + .and(ObjectUtil.isNotNull(bo.getFormatSuffix()), w -> { Integer format = bo.getFormatSuffix(); List list = processFormatSuffixQuery(format); if (7 == format) {