From 6d44069364cf634788d11316eba7998d84d8769d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E9=93=83=E8=96=AF=E5=A4=B4?=
 <5601833+xlsea@user.noreply.gitee.com>
Date: Tue, 29 Apr 2025 08:29:46 +0000
Subject: [PATCH] =?UTF-8?q?!675=20update=20=E6=9F=A5=E8=AF=A2=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=8E=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?ID=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20*=20update=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E7=B1=BB=E5=9E=8B=E4=B8=8E?=
 =?UTF-8?q?=E7=88=B6=E7=BA=A7ID=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/system/service/impl/SysMenuServiceImpl.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
index 40643e13d..19048abc4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
@@ -71,6 +71,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
                 .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
                 .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                .eq(StringUtils.isNotBlank(menu.getMenuType()), SysMenu::getMenuType, menu.getMenuType())
+                .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId())
                 .orderByAsc(SysMenu::getParentId)
                 .orderByAsc(SysMenu::getOrderNum));
         } else {
@@ -79,6 +81,8 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
                 .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
                 .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
+                .eq(StringUtils.isNotBlank(menu.getMenuType()), "m.menu_type", menu.getMenuType())
+                .eq(ObjectUtil.isNotNull(menu.getParentId()), "m.parent_id", menu.getParentId())
                 .orderByAsc("m.parent_id")
                 .orderByAsc("m.order_num");
             List<SysMenu> list = baseMapper.selectMenuListByUserId(wrapper);