diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java index ab18900..601132b 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysMenuServiceImpl.java @@ -1,32 +1,26 @@ package com.bonus.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 com.bonus.system.api.domain.SysDept; -import com.bonus.system.api.domain.SysMenu; -import com.bonus.system.domain.UserMenuParams; -import com.bonus.system.mapper.SysDeptMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.bonus.common.core.constant.Constants; import com.bonus.common.core.constant.UserConstants; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.system.api.domain.SysDept; +import com.bonus.system.api.domain.SysMenu; import com.bonus.system.api.domain.SysRole; +import com.bonus.system.domain.UserMenuParams; import com.bonus.system.domain.vo.MetaVo; import com.bonus.system.domain.vo.RouterVo; import com.bonus.system.domain.vo.TreeSelect; +import com.bonus.system.mapper.SysDeptMapper; import com.bonus.system.mapper.SysMenuMapper; import com.bonus.system.mapper.SysRoleMapper; import com.bonus.system.mapper.SysRoleMenuMapper; import com.bonus.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; /** * 菜单 业务层处理 @@ -75,8 +69,8 @@ public class SysMenuServiceImpl implements ISysMenuService String str = menu.getMenuName().replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_"); menu.setMenuName(str); } - SysDept sysDept = deptMapper.selectDeptById(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); - menu.setTemplateId(sysDept.getMenuTemplateId()); + /*SysDept sysDept = deptMapper.selectDeptById(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + menu.setTemplateId(sysDept.getMenuTemplateId());*/ List menuList = menuMapper.selectMenuList(menu); return menuList; }