From 89ed14fb4475331ebff15c9175165560f8b172d1 Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Sat, 22 Jun 2024 20:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/da/dangan/service/impl/DaCatalogServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/dangan/DaCatalogMapper.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 e743364..b475c8d 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
@@ -101,8 +101,8 @@ public class DaCatalogServiceImpl implements IDaCatalogService
     @Override
     public List<DaCatalog> selectDaCatalogList(DaCatalog daCatalog, LoginUser loginUser)
     {
-        List<DaCatalog> catalogList = null;
-        // 超管及管理员显示所有目录信息
+        List<DaCatalog> catalogList;
+        // 超管及角色为管理员显示所有目录信息
         if (SysUser.isAdmin(loginUser.getUserId())||
                 loginUser.getUser().getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().equals("sysAdmin")))
         {
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
index 36a9442..5c51b44 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by c.pid, c.order_num
     </select>
-    <!--查村用户所包含权限的id的集合-->
+    <!--查用户所包含权限的id的集合-->
     <select id="selectCatalogIdsByUserId" resultType="Long">
 		select c.id
 		from da_catalog c