投资效益系统-管理员查看菜单类型区分

src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -198,8 +198,8 @@ public class MenuController extends BladeController {
 	@GetMapping("/routes")
 	@ApiOperationSupport(order = 8)
 	@Operation(summary = "前端菜单数据", description = "前端菜单数据")
-	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId ,Integer systemType) {
-		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,user.getClientId(),systemType);
+	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId ,Integer systemType,String sysType) {
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,user.getClientId(),systemType,sysType);
 		return R.data(list);
 	}
 

src/main/java/org/springblade/modules/system/service/IMenuService.java

@@ -67,7 +67,7 @@ public interface IMenuService extends IService<Menu> {
 	 * @param topMenuId
 	 * @return
 	 */
-	List<MenuVO> routes(String roleId, Long topMenuId,String clientId,Integer systemType);
+	List<MenuVO> routes(String roleId, Long topMenuId,String clientId,Integer systemType,String sysType);
 
 	/**
 	 * 菜单树形结构

src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java

@@ -26,6 +26,7 @@
 package org.springblade.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
@@ -90,7 +91,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	}
 
 	@Override
-	public List<MenuVO> routes(String roleId, Long topMenuId,String clientId,Integer systemType) {
+	public List<MenuVO> routes(String roleId, Long topMenuId,String clientId,Integer systemType,String sysType) {
 		if (StringUtil.isBlank(roleId)) {
 			return null;
 		}
@@ -98,7 +99,18 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 		List<Menu> roleMenus;
 		// 超级管理员并且不是顶部菜单请求则返回全部菜单
 		if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
-			roleMenus = allMenus;
+			QueryWrapper<Menu> menuQueryWrapper = new QueryWrapper<>();
+			LambdaQueryWrapper<Menu> lambda = menuQueryWrapper.lambda();
+			lambda.eq(Menu::getIsDeleted, 0)
+					.eq(Menu::getCategory,1)
+					.eq(StringUtil.isNotBlank(sysType),Menu::getSysType,sysType);
+			if(systemType!=null){
+                lambda.eq(Menu::getSystemType,systemType);
+			}else{
+                lambda.isNull(Menu::getSystemType);
+            }
+			roleMenus = baseMapper.selectList(lambda);
+
 		}
 		// 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
 		else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {