lbqms.git - Gitblit

			@@ -14,6 +14,7 @@
			import org.dromara.common.core.utils.MapstructUtils;
			import org.dromara.common.core.utils.StreamUtils;
			import org.dromara.common.core.utils.StringUtils;
			import org.dromara.common.encrypt.annotation.ApiEncrypt;
			import org.dromara.common.excel.core.ExcelResult;
			import org.dromara.common.excel.utils.ExcelUtil;
			import org.dromara.common.log.annotation.Log;
			@@ -115,6 +116,7 @@
			if (ObjectUtil.isNull(user)) {
			return R.fail("没有权限访问用户数据!");
			}
			user.setRoles(roleService.selectRolesByUserId(user.getUserId()));
			userInfoVo.setUser(user);
			userInfoVo.setPermissions(loginUser.getMenuPermission());
			userInfoVo.setRoles(loginUser.getRolePermission());
			@@ -141,7 +143,7 @@
			if (ObjectUtil.isNotNull(userId)) {
			SysUserVo sysUser = userService.selectUserById(userId);
			userInfoVo.setUser(sysUser);
			userInfoVo.setRoleIds(StreamUtils.toList(sysUser.getRoles(), SysRoleVo::getRoleId));
			userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
			userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
			}
			return R.ok(userInfoVo);
			@@ -209,6 +211,7 @@
			/**
			* 重置密码
			*/
			@ApiEncrypt
			@SaCheckPermission("system:user:resetPwd")
			@Log(title = "用户管理", businessType = BusinessType.UPDATE)
			@PutMapping("/resetPwd")
			@@ -239,8 +242,9 @@
			@SaCheckPermission("system:user:query")
			@GetMapping("/authRole/{userId}")
			public R<SysUserInfoVo> authRole(@PathVariable Long userId) {
			userService.checkUserDataScope(userId);
			SysUserVo user = userService.selectUserById(userId);
			List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
			List<SysRoleVo> roles = roleService.selectRolesAuthByUserId(userId);
			SysUserInfoVo userInfoVo = new SysUserInfoVo();
			userInfoVo.setUser(user);
			userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));