From 52d0d62c35d01ee73d9dba7b1be99a29adc35ef2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 八月 2021 10:45:01 +0800
Subject: [PATCH] update 同步 ruoyi 适配改动
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 337f9de..c8344b8 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
@@ -9,10 +9,9 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
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.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
@@ -60,7 +59,7 @@
public void export(SysRole role, HttpServletResponse response)
{
List<SysRole> list = roleService.selectRoleList(role);
- ExcelUtils.exportExcel(list, "瑙掕壊鏁版嵁", SysRole.class, response);
+ ExcelUtil.exportExcel(list, "瑙掕壊鏁版嵁", SysRole.class, response);
}
/**
@@ -89,7 +88,7 @@
{
return AjaxResult.error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
- role.setCreateBy(SecurityUtils.getUsername());
+ role.setCreateBy(getUsername());
return toAjax(roleService.insertRole(role));
}
@@ -111,7 +110,7 @@
{
return AjaxResult.error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
- role.setUpdateBy(SecurityUtils.getUsername());
+ role.setUpdateBy(getUsername());
if (roleService.updateRole(role) > 0)
{
@@ -149,7 +148,7 @@
public AjaxResult changeStatus(@RequestBody SysRole role)
{
roleService.checkRoleAllowed(role);
- role.setUpdateBy(SecurityUtils.getUsername());
+ role.setUpdateBy(getUsername());
return toAjax(roleService.updateRoleStatus(role));
}
--
Gitblit v1.9.3