From 836d65328c22c4e0aee3f6df995af2e743f429e2 Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Sat, 11 May 2024 14:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E5=8F=8A=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=89=A9?=
 =?UTF-8?q?=E7=90=86=E4=B9=A6=E6=9E=B6=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/da/dangan/controller/DaCatalogController.java    | 2 +-
 .../src/main/java/com/da/dangan/mapper/DaCatalogMapper.java   | 2 +-
 .../main/java/com/da/dangan/service/IDaCatalogService.java    | 2 +-
 .../java/com/da/dangan/service/impl/DaCatalogServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/dangan/DaBookshelfMapper.xml    | 1 +
 .../src/main/resources/mapper/dangan/DaCatalogMapper.xml      | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
index 61ab70b..d894ee9 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
@@ -58,7 +58,7 @@ public class DaCatalogController extends BaseController
         //查询全部目录列表
         List<DaCatalog> catalogs = daCatalogService.selectDaCatalogList(new DaCatalog());
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", daCatalogService.selectCatalogListByUserId(userId));
+        ajax.put("checkedKeys", daCatalogService.selectCatalogIdsByUserId(userId));
         ajax.put("catalogs", daCatalogService.buildCatalogTreeSelect(catalogs));
         return ajax;
     }
diff --git a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java
index f3d1d3c..b7cab56 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/mapper/DaCatalogMapper.java
@@ -65,5 +65,5 @@ public interface DaCatalogMapper
 
     List<DaCatalog> selectDaCatalogListByUserId(DaCatalog daCatalog);
 
-    List<Long> selectCatalogListByUserId(Long userId);
+    List<Long> selectCatalogIdsByUserId(Long userId);
 }
diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java
index d3e0a89..6281b6b 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCatalogService.java
@@ -88,7 +88,7 @@ public interface IDaCatalogService
      */
     List<TreeSelect> buildCatalogTreeSelect(List<DaCatalog> catalogs);
 
-    List<Long> selectCatalogListByUserId(Long userId);
+    List<Long> selectCatalogIdsByUserId(Long userId);
 
 
 }
diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
index a9d9234..d4bf168 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCatalogServiceImpl.java
@@ -43,8 +43,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService
     }
 
     @Override
-    public List<Long> selectCatalogListByUserId(Long userId) {
-        return daCatalogMapper.selectCatalogListByUserId(userId);
+    public List<Long> selectCatalogIdsByUserId(Long userId) {
+        return daCatalogMapper.selectCatalogIdsByUserId(userId);
     }
 
     @Override
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml
index 4ff7100..8ea17a1 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBookshelfMapper.xml
@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
             <if test="orderNum != null "> and order_num = #{orderNum}</if>
         </where>
+        order by pid, order_num
     </select>
     
     <select id="selectDaBookshelfByShelfId" parameterType="Long" resultMap="DaBookshelfResult">
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
index 6fd0668..e834472 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
@@ -58,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by c.pid, c.order_num
     </select>
-
-    <select id="selectCatalogListByUserId" resultType="Long">
+    <!--查村用户所包含权限的id的集合-->
+    <select id="selectCatalogIdsByUserId" resultType="Long">
 		select c.id
 		from da_catalog c
              left join da_user_catalog uc on c.id = uc.mu_id