From 81f7d33e65329857890b4c241e01b3446229c5c5 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Fri, 16 Dec 2022 18:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BB=A3=E7=A0=81=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menu/dao/mapper/SysMenuMapper.java        | 10 ++--
 .../service/menu/dao/mapper/SysMenuMapper.xml | 46 ++++++++++---------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
index bb92aa0..3115aa5 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java
@@ -13,7 +13,7 @@ import java.util.List;
  * 菜单表 Mapper 接口
  * </p>
  *
- * @author generator
+ * @author ldjun
  * @since 2022-12-15
  */
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
@@ -32,12 +32,12 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
     List<SysMenu> findByUser(@Param("userId") String userId);
 
     /**
-     * 根据id获取权限
+     * 根据用户标识获取权限列表
      *
-     * @param userId
-     * @return
+     * @param userId 用户标识
+     * @return 权限列表
      */
-    List<String> getPermissionByUserId(String userId);
+    List<String> getPermissionByUserId(@Param("userId") String userId);
 
     /**
      * 解绑角色菜单
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
index 8ec2d25..35fc707 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
@@ -15,34 +15,38 @@
         FROM
         sys_roles_menus
         WHERE
-        role_id IN ( SELECT role_id FROM sys_users_roles WHERE 1 = 1 and user_id=#{userId} ))
+        role_id IN ( SELECT role_id FROM sys_users_roles
+        <where>
+            and user_id=#{userId}
+        </where>
+        ))
 
     </select>
     <select id="getPermissionByUserId" resultType="java.lang.String">
         SELECT DISTINCT
-            permission
+        permission
         FROM
-            sys_menu
+        sys_menu
         WHERE
-            menu_id IN
+        menu_id IN
         (
-            SELECT
-                menu_id
-            FROM
-                sys_roles_menus
-            WHERE
-                role_id IN
-            (
-                SELECT
-                    role_id
-                FROM
-                    sys_users_roles
-                WHERE
-                1=1
-                <if test="userId != null">
-                    AND user_id = #{userId}
-                </if>
-            )
+        SELECT
+        menu_id
+        FROM
+        sys_roles_menus
+        WHERE
+        role_id IN
+        (
+        SELECT
+        role_id
+        FROM
+        sys_users_roles
+        <where>
+            <if test="userId != null">
+                AND user_id = #{userId}
+            </if>
+        </where>
+        )
         )
         AND permission IS NOT NULL
         AND permission != ''