From 205c25e5f948c70215f5655fc6b1497e590cbd4e Mon Sep 17 00:00:00 2001
From: chenhaojie <hjchencq@isoftstone.com>
Date: Tue, 25 Jun 2024 17:51:01 +0800
Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/das/common/interceptor/FilterConfig.java   | 2 +-
 .../com/das/modules/auth/controller/SysMenusController.java  | 5 ++---
 .../main/java/com/das/modules/auth/mapper/SysMenuMapper.java | 2 +-
 .../java/com/das/modules/auth/service/SysMenuService.java    | 2 +-
 .../das/modules/auth/service/impl/SysMenuServiceImpl.java    | 5 +++--
 das/src/main/resources/mapper/SysMenuMapper.xml              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/das/src/main/java/com/das/common/interceptor/FilterConfig.java b/das/src/main/java/com/das/common/interceptor/FilterConfig.java
index cc1d2099..b148e5c6 100644
--- a/das/src/main/java/com/das/common/interceptor/FilterConfig.java
+++ b/das/src/main/java/com/das/common/interceptor/FilterConfig.java
@@ -22,7 +22,7 @@ public class FilterConfig {
         FilterRegistrationBean registrationBean = new FilterRegistrationBean();
         //注册过滤器
         registrationBean.setFilter(new DecryptingOncePerRequestFilter(aesProperties.getKey()));
-        registrationBean.addUrlPatterns("/api/*"); // 设置过滤器应用的URL模式
+        registrationBean.addUrlPatterns("/api/auth/role"); // 设置过滤器应用的URL模式
         registrationBean.setOrder(2); // 设置过滤器的顺序
         return registrationBean;
     }
diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
index 251885fa..6d5dbefb 100644
--- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
+++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
@@ -76,11 +76,10 @@ public class SysMenusController {
 
     /**
      * 获取绑定的菜单列表
-     * @param sysMenuQueryDto 查询条件
      * @return 返回菜单列表
      */
     @PostMapping("/tree")
-    public List<SysMenuVo> createTree(@RequestBody SysMenuQueryDto sysMenuQueryDto) {
-        return sysMenuService.createTree(sysMenuQueryDto);
+    public R<?> createTree() {
+        return R.success(sysMenuService.createTree());
     }
 }
diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
index 52eae7b9..2ad03d8d 100644
--- a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
+++ b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java
@@ -22,5 +22,5 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
     List<SysMenuVo> queryAllMenuList(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
 
-    List<SysMenuVo> createTree(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
+    SysMenuVo createTree();
 }
diff --git a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java
index 45e5fd5f..02ff193d 100644
--- a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java
+++ b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java
@@ -32,5 +32,5 @@ public interface SysMenuService {
      * 构建菜单树结构
      * @return 返回菜单树
      */
-    List<SysMenuVo> createTree(SysMenuQueryDto sysMenuQueryDto);
+    SysMenuVo createTree();
 }
diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
index e59eca4a..6cb57b1e 100644
--- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
+++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java
@@ -63,8 +63,9 @@ public class SysMenuServiceImpl implements SysMenuService {
     }
 
     @Override
-    public List<SysMenuVo> createTree(SysMenuQueryDto sysMenuQueryDto) {
-        return sysMenuMapper.createTree(sysMenuQueryDto);
+    public SysMenuVo createTree() {
+
+        return sysMenuMapper.createTree();
     }
 
 }
diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml
index 1b2b4f9f..0c3fa2cd 100644
--- a/das/src/main/resources/mapper/SysMenuMapper.xml
+++ b/das/src/main/resources/mapper/SysMenuMapper.xml
@@ -59,7 +59,7 @@
     </select>
 
     <select id="createTree" resultMap="SysMenuChildMap">
-        select * from sys_menu left join  where parent_menu_id = 0
+        select * from sys_menu  where parent_menu_id = 0
     </select>
 
 </mapper>