From a3aa8bd77b4a9a74601238cc467cfd115b0821b6 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 05 九月 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserRoleController.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 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..4bd9ba1 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;
@@ -96,4 +95,22 @@
 	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