product-inventory-management-after.git

			@@ -2,6 +2,7 @@

			import java.util.List;
			import java.util.stream.Collectors;
			import org.apache.commons.lang3.ArrayUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.validation.annotation.Validated;
			@@ -127,15 +128,17 @@
			{
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
			}
			else if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
			else if (StringUtils.isNotEmpty(user.getPhonenumber())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
			{
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
			}
			else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
			else if (StringUtils.isNotEmpty(user.getEmail())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
			{
			return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setCreateBy(SecurityUtils.getUsername());
			user.setCreateBy(getUsername());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			return toAjax(userService.insertUser(user));
			}
			@@ -149,15 +152,17 @@
			public AjaxResult edit(@Validated @RequestBody SysUser user)
			{
			userService.checkUserAllowed(user);
			if (UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
			if (StringUtils.isNotEmpty(user.getPhonenumber())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
			{
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
			}
			else if (UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
			else if (StringUtils.isNotEmpty(user.getEmail())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
			{
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setUpdateBy(SecurityUtils.getUsername());
			user.setUpdateBy(getUsername());
			return toAjax(userService.updateUser(user));
			}

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

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

			@@ -195,7 +204,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();
			}
			}