From c380b776178ad0e51f6ed183302fe71af76c1059 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 19 八月 2021 17:33:46 +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/SysUserController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index e9db98b..65a5118 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.system;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
@@ -9,11 +10,9 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
-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.ExcelUtil;
import com.ruoyi.framework.web.service.TokenService;
@@ -53,9 +52,6 @@
@Autowired
private ISysPostService postService;
- @Autowired
- private TokenService tokenService;
-
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@@ -91,8 +87,7 @@
{
List<SysUserImportVo> userListVo = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class);
List<SysUser> userList = BeanUtil.copyToList(userListVo, SysUser.class);
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- String operName = loginUser.getUsername();
+ String operName = getUsername();
String message = userService.importUser(userList, updateSupport, operName);
return AjaxResult.success(message);
}
@@ -145,7 +140,7 @@
{
return AjaxResult.error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- user.setCreateBy(SecurityUtils.getUsername());
+ user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
return toAjax(userService.insertUser(user));
}
@@ -169,7 +164,7 @@
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
- user.setUpdateBy(SecurityUtils.getUsername());
+ user.setUpdateBy(getUsername());
return toAjax(userService.updateUser(user));
}
@@ -181,6 +176,10 @@
@DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds)
{
+ if (ArrayUtil.contains(userIds, getUserId()))
+ {
+ return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
+ }
return toAjax(userService.deleteUserByIds(userIds));
}
@@ -194,7 +193,7 @@
{
userService.checkUserAllowed(user);
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setUpdateBy(SecurityUtils.getUsername());
+ user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
}
@@ -207,7 +206,7 @@
public AjaxResult changeStatus(@RequestBody SysUser user)
{
userService.checkUserAllowed(user);
- user.setUpdateBy(SecurityUtils.getUsername());
+ user.setUpdateBy(getUsername());
return toAjax(userService.updateUserStatus(user));
}
--
Gitblit v1.9.3