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

云

2 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2

 src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java

@@ -1,15 +1,5 @@
package com.ruoyi.project.system.service.impl;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashSet;

import java.util.Iterator;

import java.util.LinkedList;

import java.util.List;

import java.util.Set;

import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.utils.SecurityUtils;

@@ -24,6 +14,11 @@
import com.ruoyi.project.system.mapper.SysRoleMapper;

import com.ruoyi.project.system.mapper.SysRoleMenuMapper;

import com.ruoyi.project.system.service.ISysMenuService;

import lombok.RequiredArgsConstructor;

import org.springframework.stereotype.Service;



import java.util.*;

import java.util.stream.Collectors;



/**

 * 菜单 业务层处理

@@ -31,18 +26,14 @@
 * @author ruoyi

 */

@Service

@RequiredArgsConstructor

public class SysMenuServiceImpl implements ISysMenuService

{

    public static final String PREMISSION_STRING = "perms[\"{0}\"]";



    @Autowired

    private SysMenuMapper menuMapper;



    @Autowired

    private SysRoleMapper roleMapper;



    @Autowired

    private SysRoleMenuMapper roleMenuMapper;

    private final SysMenuMapper menuMapper;

    private final SysRoleMapper roleMapper;

    private final SysRoleMenuMapper roleMenuMapper;



    /**

     * 根据用户查询系统菜单列表