From 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期四, 31 七月 2025 21:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
index 2ee46fc..f14a0b8 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/MenuServiceImpl.java
@@ -1,12 +1,5 @@
package com.stylefeng.guns.modular.system.service.impl;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -15,6 +8,11 @@
import com.stylefeng.guns.modular.system.dao.MenuMapper;
import com.stylefeng.guns.modular.system.model.Menu;
import com.stylefeng.guns.modular.system.service.IMenuService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
/**
* 菜单服务
@@ -66,13 +64,13 @@
}
@Override
- public List<ZTreeNode> menuTreeList() {
- return this.baseMapper.menuTreeList();
+ public List<ZTreeNode> menuTreeList(List<Long> ids) {
+ return this.baseMapper.menuTreeList(ids);
}
@Override
- public List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds) {
- return this.baseMapper.menuTreeListByMenuIds(menuIds);
+ public List<ZTreeNode> menuTreeListByMenuIds(List<Long> menuIds, List<Long> ids) {
+ return this.baseMapper.menuTreeListByMenuIds(menuIds, ids);
}
@Override
--
Gitblit v1.7.1