From e14d495581896374cc4be7ec929feb95005e6563 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 15 六月 2023 18:22:39 +0800 Subject: [PATCH] 修改系统管理、编码规则管理bug --- Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java index f597a76..039a4b3 100644 --- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java +++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java @@ -16,7 +16,9 @@ */ package com.vci.ubcs.system.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.vci.ubcs.system.entity.Menu; import com.vci.ubcs.system.entity.TopMenu; @@ -31,6 +33,7 @@ import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; @@ -133,9 +136,9 @@ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) @ApiOperationSupport(order = 5) @ApiOperation(value = "鎳掑姞杞借彍鍗曞垪琛�", notes = "浼犲叆menu") - public R<List<MenuVO>> lazyMenuList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) { - List<MenuVO> list = menuService.lazyMenuList(parentId, menu); - return R.data(MenuWrapper.build().listNodeLazyVO(list)); + public R<IPage<MenuVO>> lazyMenuList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu, Query query) { + IPage<MenuVO> menuVOIPage = menuService.lazyMenuPage(parentId, menu,query); + return R.data(MenuWrapper.build().pageNodeLazyVO(menuVOIPage)); } /** -- Gitblit v1.9.3