|
@@ -72,7 +72,7 @@ public class SysUserController extends BaseController {
|
|
|
|
|
|
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
|
|
// @PreAuthorize("@ss.hasPermi('system:user:import')")
|
|
|
- @PostMapping("/importData")
|
|
|
+// @PostMapping("/importData")
|
|
|
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
|
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
|
List<SysUser> userList = util.importExcel(file.getInputStream());
|
|
@@ -112,7 +112,7 @@ public class SysUserController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('system:user:add')")
|
|
|
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
|
- @PostMapping
|
|
|
+// @PostMapping
|
|
|
public AjaxResult add(@Validated @RequestBody SysUser user) {
|
|
|
if (!userService.checkUserNameUnique(user)) {
|
|
|
return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
@@ -131,7 +131,7 @@ public class SysUserController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
|
- @PutMapping
|
|
|
+// @PutMapping
|
|
|
public AjaxResult edit(@Validated @RequestBody SysUser user) {
|
|
|
userService.checkUserAllowed(user);
|
|
|
userService.checkUserDataScope(user.getUserId());
|
|
@@ -151,7 +151,7 @@ public class SysUserController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('system:user:remove')")
|
|
|
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
|
- @DeleteMapping("/{userIds}")
|
|
|
+// @DeleteMapping("/{userIds}")
|
|
|
public AjaxResult remove(@PathVariable Long[] userIds) {
|
|
|
if (ArrayUtils.contains(userIds, getUserId())) {
|
|
|
return error("当前用户不能删除");
|
|
@@ -164,7 +164,7 @@ public class SysUserController extends BaseController {
|
|
|
*/
|
|
|
// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
|
- @PutMapping("/resetPwd")
|
|
|
+// @PutMapping("/resetPwd")
|
|
|
public AjaxResult resetPwd(@RequestBody SysUser user) {
|
|
|
userService.checkUserAllowed(user);
|
|
|
userService.checkUserDataScope(user.getUserId());
|