Commit 5d5962d8 authored by wangxl's avatar wangxl

1

parent 96bb2f49
......@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yiboshi.science.base.BaseServiceImpl;
import com.yiboshi.science.base.Pagination;
import com.yiboshi.science.config.security.SecurityUserHolder;
import com.yiboshi.science.dao.SystemMenuDAO;
import com.yiboshi.science.entity.SystemMenu;
import com.yiboshi.science.enumeration.CommonEnum;
import com.yiboshi.science.param.dto.MenuTreeDTO;
import com.yiboshi.science.param.dto.Slots;
import com.yiboshi.science.param.dto.SystemMenuDTO;
......@@ -77,8 +79,11 @@ public class SystemMenuServiceImpl extends BaseServiceImpl<SystemMenuDAO, System
for (int i = 0; i < arr.length; i++) {
resultList.add(arr[i]);
}
wrapper.like("a.system_type", systemType);
if (!SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.sys.getCode().toString())) {
wrapper.like("a.system_type", systemType);
}
wrapper.in("b.role_id", resultList);
List<SystemMenuDTO> list = systemMenuDAO.findByRoleId(wrapper);
//父级菜单
List<UserMenuDTO> ParMenuList = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment