lbqms.git - Gitblit

			@@ -145,7 +145,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 +169,7 @@
			{
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setUpdateBy(SecurityUtils.getUsername());
			user.setUpdateBy(getUsername());
			return toAjax(userService.updateUser(user));
			}

			@@ -181,6 +181,10 @@
			@DeleteMapping("/{userIds}")
			public AjaxResult remove(@PathVariable Long[] userIds)
			{
			if (ArrayUtil.contains(userIds, getUserId()))
			{
			return error("当前用户不能删除");
			}
			return toAjax(userService.deleteUserByIds(userIds));
			}

			@@ -194,7 +198,7 @@
			{
			userService.checkUserAllowed(user);
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			user.setUpdateBy(SecurityUtils.getUsername());
			user.setUpdateBy(getUsername());
			return toAjax(userService.resetPwd(user));
			}

			@@ -207,7 +211,7 @@
			public AjaxResult changeStatus(@RequestBody SysUser user)
			{
			userService.checkUserAllowed(user);
			user.setUpdateBy(SecurityUtils.getUsername());
			user.setUpdateBy(getUsername());
			return toAjax(userService.updateUserStatus(user));
			}