From 0cff3ff8bd9833925740ba50052b73a1dd538340 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Tue, 18 Jun 2024 14:18:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/file/SysOssTextbookController.java      | 4 ++--
 .../java/org/dromara/system/domain/vo/SysOssTextbookVo.java   | 2 ++
 .../system/service/impl/SysOssTextbookServiceImpl.java        | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java
index 4c3b9c8..b5bdf71 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java
@@ -105,12 +105,12 @@ public class SysOssTextbookController extends BaseController {
     }
 
     /**
-     * 审核
+     * 复制
      *
      * @param bo 主键串
      */
     @SaCheckPermission("file:textbook:copy")
-    @Log(title = "【审核同步教材】", businessType = BusinessType.UPDATE)
+    @Log(title = "【复制同步教材】", businessType = BusinessType.UPDATE)
     @PutMapping("/copy")
     public R<Void> copy(@RequestBody SysOssTextbookBo bo) {
         return toAjax(sysOssTextbookService.copyByBo(bo));
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
index 116943e..d30edc4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
@@ -25,6 +25,8 @@ public class SysOssTextbookVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+
+    private Long id;
     /**
      *
      */
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 2ec0d15..3b07f24 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
@@ -84,10 +84,10 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
         wrapper.eq(ObjectUtil.isNotNull(bo.getType()), "ot.type", bo.getType())
             .eq(ObjectUtil.isNotNull(bo.getStatus()), "ot.status", bo.getStatus())
             .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> {
-                List<SysCatalogTextbook> deptList = catalogService.selectList(new LambdaQueryWrapper<SysCatalogTextbook>()
+                List<SysCatalogTextbook> list = catalogService.selectList(new LambdaQueryWrapper<SysCatalogTextbook>()
                     .select(SysCatalogTextbook::getCatalogId)
                     .apply(DataBaseHelper.findInSet(bo.getCatalogId(), "ancestors")));
-                List<Long> ids = StreamUtils.toList(deptList, SysCatalogTextbook::getCatalogId);
+                List<Long> ids = StreamUtils.toList(list, SysCatalogTextbook::getCatalogId);
                 ids.add(bo.getCatalogId());
                 w.in("ot.catalog_id", ids);
             });