From 08db4a5f53e17f3224e4f0caa66f1b76e3971aaf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 04 八月 2021 19:03:25 +0800
Subject: [PATCH] update 更改所有业务excel导出
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index c36c3e6..88fa256 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;
-import cn.hutool.core.lang.Validator;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -12,6 +11,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
@@ -23,6 +23,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -56,11 +57,10 @@
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:role:export')")
@GetMapping("/export")
- public AjaxResult export(SysRole role)
+ public void export(SysRole role, HttpServletResponse response)
{
List<SysRole> list = roleService.selectRoleList(role);
- ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
- return util.exportExcel(list, "瑙掕壊鏁版嵁");
+ ExcelUtil.exportExcel(list, "瑙掕壊鏁版嵁", SysRole.class, response);
}
/**
@@ -117,7 +117,7 @@
{
// 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- if (Validator.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+ if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
{
loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
@@ -181,9 +181,7 @@
@GetMapping("/authUser/allocatedList")
public TableDataInfo allocatedList(SysUser user)
{
- startPage();
- List<SysUser> list = userService.selectAllocatedList(user);
- return getDataTable(list);
+ return userService.selectAllocatedList(user);
}
/**
@@ -193,9 +191,7 @@
@GetMapping("/authUser/unallocatedList")
public TableDataInfo unallocatedList(SysUser user)
{
- startPage();
- List<SysUser> list = userService.selectUnallocatedList(user);
- return getDataTable(list);
+ return userService.selectUnallocatedList(user);
}
/**
@@ -212,6 +208,7 @@
/**
* 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
*/
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/cancelAll")
public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
@@ -222,6 +219,7 @@
/**
* 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
*/
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
@Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
@PutMapping("/authUser/selectAll")
public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
--
Gitblit v1.9.3