From 19df67e19f23cd2a04d1c7f355e1e656f4140af4 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 17 四月 2025 20:04:14 +0800
Subject: [PATCH] 后台：首页统计、系统管理、广告管理、用户管理、商品分类管理
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 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 074a50d..70657cd 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
@@ -127,12 +127,8 @@
role.setRoleName(dto.getRoleName());
LambdaQueryWrapper<SysRole> wrapper = Wrappers.lambdaQuery(SysRole.class)
.eq(SysRole::getRoleName, dto.getRoleName()).eq(SysRole::getDelFlag, 0);
- Long userid = tokenService.getLoginUser().getUserid();
- SysUser sysUser = sysUserService.getById(userid);
- if(sysUser.getRoleType() == 2){
- wrapper.eq(SysRole::getShopId, sysUser.getObjectId());
- }
-
+
+
long count = roleService.count(wrapper);
if (count > 0) {
return AjaxResult.error("角色已存在，请重新输入");
@@ -146,10 +142,7 @@
role.setRemark(dto.getRemark());
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
-
- if(sysUser.getRoleType() == 2){
- role.setShopId(sysUser.getObjectId());
- }
+
roleService.insertRole(role);
return AjaxResult.success();
}
@@ -208,20 +201,8 @@
ArrayList<SysRoleMenu> sysRoleMenus = new ArrayList<>();
List<Long> menuIds = dto.getMenuIds();
// 移除原来的权限菜单
- if (menuIds.contains(1061L)) {
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
- .eq(SysRoleMenu::getRoleId, dto.getRoleId()));
- } else {
- sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>()
- .eq(SysRoleMenu::getRoleId, dto.getRoleId())
- .ne(SysRoleMenu::getMenuId, 1061L)
- .ne(SysRoleMenu::getMenuId, 1062L)
- .ne(SysRoleMenu::getMenuId, 1065L)
- .ne(SysRoleMenu::getMenuId, 1073L)
- .ne(SysRoleMenu::getMenuId, 1161L)
- .ne(SysRoleMenu::getMenuId, 1203L)
- );
- }
+ sysRoleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, dto.getRoleId()));
+
for (Long menuId : menuIds) {
SysRoleMenu sysRoleMenu = new SysRoleMenu();
sysRoleMenu.setMenuId(menuId);
--
Gitblit v1.7.1