From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index cfafdb3..6462a0c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -6,7 +6,6 @@
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
@@ -16,6 +15,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
@@ -44,11 +44,10 @@
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:dict:export')")
@GetMapping("/export")
- public AjaxResult export(SysDictData dictData)
+ public void export(SysDictData dictData, HttpServletResponse response)
{
List<SysDictData> list = dictDataService.selectDictDataList(dictData);
- ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
- return util.exportExcel(list, "瀛楀吀鏁版嵁");
+ ExcelUtil.exportExcel(list, "瀛楀吀鏁版嵁", SysDictData.class, response);
}
/**
@@ -83,7 +82,7 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody SysDictData dict)
{
- dict.setCreateBy(SecurityUtils.getUsername());
+ dict.setCreateBy(getUsername());
return toAjax(dictDataService.insertDictData(dict));
}
@@ -95,7 +94,7 @@
@PutMapping
public AjaxResult edit(@Validated @RequestBody SysDictData dict)
{
- dict.setUpdateBy(SecurityUtils.getUsername());
+ dict.setUpdateBy(getUsername());
return toAjax(dictDataService.updateDictData(dict));
}
--
Gitblit v1.9.3