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/dict/DictDataController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
index c49d078..a6b18c8 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
@@ -7,6 +7,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.dict.vo.data.DictDataImportExcelVO;
+import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataImportReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataImportRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
@@ -24,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -110,4 +114,25 @@
BeanUtils.toBean(list, DictDataRespVO.class));
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆瀛楀吀鏁版嵁妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<DictDataImportExcelVO> list = Arrays.asList(
+ DictDataImportExcelVO.builder().sort(1).label("绀轰緥瀛楀吀鏁版嵁").value("demo")
+ .dictType("demo_dict_type").status(0).colorType("").cssClass("").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "瀛楀吀鏁版嵁瀵煎叆妯℃澘.xls", "瀛楀吀鏁版嵁鍒楄〃", DictDataImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆瀛楀吀鏁版嵁")
+ @PreAuthorize("@ss.hasPermission('system:dict:import')")
+ public CommonResult<DictDataImportRespVO> importExcel(@Valid DictDataImportReqVO importReqVO)
+ throws Exception {
+ List<DictDataImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), DictDataImportExcelVO.class);
+ return success(dictDataService.importDictDataList(list, importReqVO));
+ }
+
}
--
Gitblit v1.9.3