From 3244b550596e0330031b3f4547356927df83b0ad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 19 五月 2025 11:48:35 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
index b0ef148..b8d8b98 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java
@@ -1,20 +1,19 @@
package com.ruoyi.system.controller;
+import java.util.ArrayList;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.model.SysUserRoleVo;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysUserRoleService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
@@ -38,7 +37,6 @@
/**
* 查询用户和角色关联列表
*/
- @RequiresPermissions("car:role:list")
@GetMapping("/list")
public TableDataInfo list(SysUserRole sysUserRole) {
startPage();
@@ -49,7 +47,6 @@
/**
* 导出用户和角色关联列表
*/
- @RequiresPermissions("car:role:export")
@Log(title = "用户和角色关联", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SysUserRole sysUserRole) {
@@ -61,7 +58,6 @@
/**
* 获取用户和角色关联详细信息
*/
- @RequiresPermissions("car:role:query")
@GetMapping(value = "/{userId}")
public AjaxResult getInfo(@PathVariable("userId") Long userId) {
return success(sysUserRoleService.selectSysUserRoleByUserId(userId));
@@ -70,7 +66,6 @@
/**
* 新增用户和角色关联
*/
- @RequiresPermissions("car:role:add")
@Log(title = "用户和角色关联", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SysUserRole sysUserRole) {
@@ -80,7 +75,6 @@
/**
* 修改用户和角色关联
*/
- @RequiresPermissions("car:role:edit")
@Log(title = "用户和角色关联", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SysUserRole sysUserRole) {
@@ -90,10 +84,27 @@
/**
* 删除用户和角色关联
*/
- @RequiresPermissions("car:role:remove")
@Log(title = "用户和角色关联", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds) {
return toAjax(sysUserRoleService.deleteSysUserRoleByUserIds(userIds));
}
+
+
+ /**
+ * 根据用户id获取角色
+ * @param userId
+ * @return
+ */
+ @PostMapping("/getRoleByUserId")
+ public R<List<SysUserRoleVo>> getRoleByUserId(@RequestParam("userId") Long userId){
+ List<SysUserRole> list = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
+ List<SysUserRoleVo> data = new ArrayList<>();
+ for (SysUserRole sysUserRole : list) {
+ SysUserRoleVo vo = new SysUserRoleVo();
+ BeanUtils.copyProperties(sysUserRole, vo);
+ data.add(vo);
+ }
+ return R.ok(data);
+ }
}
--
Gitblit v1.7.1