lbqms.git - Gitblit

			@@ -111,7 +111,7 @@
			List<SysRole> roles = roleService.selectRoleAll();
			ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
			ajax.put("posts", postService.selectPostAll());
			if (StringUtils.isNotNull(userId)) {
			if (ObjectUtil.isNotNull(userId)) {
			SysUser sysUser = userService.selectUserById(userId);
			ajax.put("user", sysUser);
			ajax.put("postIds", postService.selectPostListByUserId(userId));
			@@ -150,6 +150,7 @@
			@PutMapping
			public AjaxResult<Void> edit(@Validated @RequestBody SysUser user) {
			userService.checkUserAllowed(user);
			userService.checkUserDataScope(user.getUserId());
			if (StringUtils.isNotEmpty(user.getPhonenumber())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
			return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
			@@ -183,6 +184,7 @@
			@PutMapping("/resetPwd")
			public AjaxResult<Void> resetPwd(@RequestBody SysUser user) {
			userService.checkUserAllowed(user);
			userService.checkUserDataScope(user.getUserId());
			user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
			return toAjax(userService.resetPwd(user));
			}
			@@ -196,6 +198,7 @@
			@PutMapping("/changeStatus")
			public AjaxResult<Void> changeStatus(@RequestBody SysUser user) {
			userService.checkUserAllowed(user);
			userService.checkUserDataScope(user.getUserId());
			return toAjax(userService.updateUserStatus(user));
			}

			@@ -226,6 +229,7 @@
			@Log(title = "用户管理", businessType = BusinessType.GRANT)
			@PutMapping("/authRole")
			public AjaxResult<Void> insertAuthRole(Long userId, Long[] roleIds) {
			userService.checkUserDataScope(userId);
			userService.insertUserAuth(userId, roleIds);
			return success();
			}