Merge remote-tracking branch 'origin/dev' into dev

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 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);
    }
}