From 239927b057f65a040594f7a4cb08c8881b303797 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:52:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl-230812' into cjl-230812
---
screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
index 8d35511..d1a0ed3 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -1,6 +1,7 @@
package com.moral.api.service.impl;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import com.moral.api.entity.Menu;
@@ -26,11 +27,18 @@
@Autowired
private UserService userService;
+ @Autowired
+ private MenuMapper menuMapper;
+
@Override
public Map<String, Object> selectMenusByOrgId(Integer orgId) {
Map<String, Object> map = new HashMap<>();
- map.put("orgId",orgId);
- Map<String, Object> menus = userService.getMenus(map);
- return menus;
+ map.put("orgId", orgId);
+ return userService.getMenus(map);
+ }
+
+ @Override
+ public List<Menu> getMenuList(Integer orgId) {
+ return menuMapper.selectOrganizationMenu(orgId);
}
}
--
Gitblit v1.8.0