From 7b1f24ca9172ad039cbd6a62d6718374807d6c76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=B0=E9=BE=99?= Date: Thu, 6 Jul 2023 18:19:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A2=AB=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E5=90=8E=E4=BE=9D?= =?UTF-8?q?=E7=84=B6=E8=83=BD=E8=A2=AB=E6=9F=A5=E8=AF=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/SysMenuMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index 039d9e63..bb1f9636 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -41,6 +41,7 @@ LEFT JOIN sys_role t3 ON t2.role_id = t3.id WHERE t1.type != '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' + AND t1.deleted = 0 ORDER BY t1.sort asc @@ -54,6 +55,7 @@ INNER JOIN sys_role t3 ON t3.id = t2.role_id WHERE t1.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' + AND t1.deleted = 0 AND t1.perm IS NOT NULL From 24bc25c04054bedaf27fbf7d9375e74110ba0d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 10 Jul 2023 03:45:20 +0000 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=A2=AB=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=90=8E=E4=BE=9D=E7=84=B6=E8=83=BD=E8=A2=AB=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7b1f24ca9172ad039cbd6a62d6718374807d6c76. --- src/main/resources/mapper/SysMenuMapper.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index bb1f9636..039d9e63 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -41,7 +41,6 @@ LEFT JOIN sys_role t3 ON t2.role_id = t3.id WHERE t1.type != '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' - AND t1.deleted = 0 ORDER BY t1.sort asc @@ -55,7 +54,6 @@ INNER JOIN sys_role t3 ON t3.id = t2.role_id WHERE t1.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' - AND t1.deleted = 0 AND t1.perm IS NOT NULL From bbc49edb5ee97672fb1640acf85e21e99c82a94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 10 Jul 2023 03:45:50 +0000 Subject: [PATCH 3/4] =?UTF-8?q?Revert=20"fix(SysMenuMapper.xml):=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A7=92=E8=89=B2=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ca91ad714b5d3695832f3123ad902edd4fcc51d0. --- src/main/resources/mapper/SysMenuMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index 039d9e63..bda56899 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -50,8 +50,8 @@ DISTINCT t1.perm FROM sys_menu t1 - INNER JOIN sys_role_menu t2 ON t1.id = t2.menu_id - INNER JOIN sys_role t3 ON t3.id = t2.role_id + INNER JOIN sys_role_menu t2 + INNER JOIN sys_role t3 WHERE t1.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' AND t1.perm IS NOT NULL From fa779c80cdad847f3820f709531eb74df6576afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com> Date: Mon, 10 Jul 2023 03:46:40 +0000 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"Revert=20"fix(SysMenuMapper.xml):?= =?UTF-8?q?=20=E9=85=8D=E7=BD=AE=E8=A7=92=E8=89=B2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E6=97=A0?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bbc49edb5ee97672fb1640acf85e21e99c82a94f. --- src/main/resources/mapper/SysMenuMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index bda56899..039d9e63 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -50,8 +50,8 @@ DISTINCT t1.perm FROM sys_menu t1 - INNER JOIN sys_role_menu t2 - INNER JOIN sys_role t3 + INNER JOIN sys_role_menu t2 ON t1.id = t2.menu_id + INNER JOIN sys_role t3 ON t3.id = t2.role_id WHERE t1.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' AND t1.perm IS NOT NULL