From f1dd87abd55b8dd95a206c80c0a185d4d4919324 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 25 三月 2023 19:17:17 +0800 Subject: [PATCH] !311 fix 修复超管切换租户后 新增用户校验的租户不正确 Merge pull request !311 from Yjoioooo/5.X --- ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index 64f2b96..2f6bc11 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -75,8 +75,7 @@ @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R<Void> importData(@RequestPart("file") MultipartFile file) throws Exception { ExcelResult<TestDemoImportVo> excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true); - List<TestDemoImportVo> volist = excelResult.getList(); - List<TestDemo> list = MapstructUtils.convert(volist, TestDemo.class); + List<TestDemo> list = MapstructUtils.convert(excelResult.getList(), TestDemo.class); testDemoService.saveBatch(list); return R.ok(excelResult.getAnalysis()); } -- Gitblit v1.9.3