From 56dfe0d4bf81262622a1919cceb2b039fd356209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 16:52:49 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index baf35a3..907fa4a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
@@ -64,7 +65,8 @@
{
@Autowired
private ISysRoleService roleService;
-
+ @Resource
+ private TokenService tokenService;
@Autowired
private ISysUserService userService;
@@ -96,6 +98,7 @@
@PostMapping("/listPage")
public AjaxResult listPage(@Validated @RequestBody RoleQuery query)
{
+ tokenService.getLoginUser();
PageInfo<SysRole> pageInfo = new PageInfo<>(query.getPageCurr(), query.getPageSize());
PageInfo<SysRole> page = roleService.page(pageInfo,
@@ -125,10 +128,12 @@
@PostMapping("/roleAdd")
public AjaxResult roleAdd(@Validated @RequestBody RoleAddDto dto)
{
+ tokenService.getLoginUser();
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
long count = roleService.count(Wrappers.lambdaQuery(SysRole.class)
- .eq(SysRole::getRoleName, dto.getRoleName()));
+ .eq(SysRole::getRoleName, dto.getRoleName())
+ .eq(SysRole::getDelFlag,"0"));
if(count>0){
return AjaxResult.error("角色已存在，请重新输入");
}
@@ -159,6 +164,7 @@
public AjaxResult roleInfo(
@ApiParam(value = "角色id", name = "id", required = true) @PathVariable("id") Long id)
{
+ tokenService.getLoginUser();
SysRole role = roleService.selectRoleById(id);
RoleInfoVo roleInfoVo = new RoleInfoVo();
roleInfoVo.setRoleId(role.getRoleId());
@@ -245,6 +251,7 @@
@PostMapping("/roleUpdate")
public AjaxResult roleUpdate(@Validated @RequestBody RoleUpdateDto dto)
{
+ tokenService.getLoginUser();
SysRole role = new SysRole();
role.setRoleName(dto.getRoleName());
SysRole one = roleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleId, dto.getRoleId()));
--
Gitblit v1.7.1