From 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:24:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 8 +++++---
1 files changed, 5 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 337fc30..f05735c 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,5 +1,6 @@
package com.moral.api.service.impl;
+import java.util.HashMap;
import java.util.Map;
import com.moral.api.entity.Menu;
@@ -23,11 +24,12 @@
public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
@Autowired
- private UserServiceImpl userService;
+ private UserService userService;
@Override
public Map<String, Object> selectMenusByOrgId(Integer orgId) {
- userService.getMenus(-1, orgId);
- return null;
+ Map<String, Object> map = new HashMap<>();
+ map.put("orgId",orgId);
+ return userService.getMenus(map);
}
}
--
Gitblit v1.8.0