product-inventory-management-after.git

			@@ -137,7 +137,7 @@
			{
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setCreateBy(SecurityUtils.getUsername());
			user.setCreateBy(getUsername());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			return toAjax(userService.insertUser(user));
			}
			@@ -161,7 +161,7 @@
			{
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setUpdateBy(SecurityUtils.getUsername());
			user.setUpdateBy(getUsername());
			return toAjax(userService.updateUser(user));
			}

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

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

			/**
			* 根据用户编号获取授权角色
			*/
			@PreAuthorize("@ss.hasPermi('system:user:query')")
			@GetMapping("/authRole/{userId}")
			public AjaxResult authRole(@PathVariable("userId") Long userId)
			{
			AjaxResult ajax = AjaxResult.success();
			SysUser user = userService.selectUserById(userId);
			List<SysRole> roles = roleService.selectRolesByUserId(userId);
			ajax.put("user", user);
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			return ajax;
			}

			/**
			* 用户授权角色
			*/
			@PreAuthorize("@ss.hasPermi('system:user:edit')")
			@Log(title = "用户管理", businessType = BusinessType.GRANT)
			@PutMapping("/authRole")
			public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
			{
			userService.insertUserAuth(userId, roleIds);
			return success();
			}
			}