Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-16 721d99ec58e38a1f586e2bed93cb8f385d1e9bc6

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -7,14 +7,15 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.model.SysUserRole;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysMenus;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.domain.vo.TreeSelect;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -31,19 +32,19 @@
{
    public static final String PREMISSION_STRING = "perms[\"{0}\"]";

    @Resource
    @Autowired
    private SysMenuMapper menuMapper;

    @Resource
    @Autowired
    private SysRoleMapper roleMapper;

    @Resource
    @Autowired
    private SysRoleMenuMapper roleMenuMapper;

    @Resource
    @Autowired
    private TokenService tokenService;

    @Resource
    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;

    @Resource