From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题
---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
index e19e285..51a39d0 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
@@ -3,6 +3,10 @@
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuImportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuRespVO;
import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSaveVO;
@@ -13,11 +17,14 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
@@ -94,4 +101,26 @@
return success(BeanUtils.toBean(menu, MenuRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆鑿滃崟妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MenuImportExcelVO> list = Arrays.asList(
+ MenuImportExcelVO.builder().name("绀轰緥鑿滃崟").parentName("").type(2).sort(0)
+ .permission("").path("demo").icon("").component("demo/index")
+ .componentName("Demo").status(0).visible(true).keepAlive(true).alwaysShow(true).build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "鑿滃崟瀵煎叆妯℃澘.xls", "鑿滃崟鍒楄〃", MenuImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆鑿滃崟")
+ @PreAuthorize("@ss.hasPermission('system:menu:import')")
+ public CommonResult<MenuImportRespVO> importExcel(@Valid MenuImportReqVO importReqVO)
+ throws Exception {
+ List<MenuImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), MenuImportExcelVO.class);
+ return success(menuService.importMenuList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3