From d22b530fa0fbd910d8d7baefa29d88d755568e68 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 15 十二月 2025 10:01:41 +0800
Subject: [PATCH] 1、 修复权限相关的bug
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
index 4e96f47..69d60d9 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java
@@ -15,7 +15,7 @@
import com.mes.role.service.SysRoleMenuService;
import com.mes.userinfo.entity.SysUser;
import com.mes.userinfo.entity.SysUserRole;
-import com.mes.userinfo.mapper.SysUserRoleMapper;
+import com.mes.userinfo.service.SysUserRoleService;
import com.mes.userinfo.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@
SysUserService sysUserService;
@Autowired
- SysUserRoleMapper sysUserRoleMapper;
+ SysUserRoleService sysUserRoleService;
@Autowired
SysRoleMenuService sysRoleMenuService;
@@ -64,12 +64,11 @@
.innerJoin(SysUser.class, SysUser::getId, SysUserRole::getUserId)
.innerJoin(SysRoleMenu.class, SysRoleMenu::getRoleId, SysUserRole::getRoleId)
.innerJoin(SysMenu.class, SysMenu::getId, SysRoleMenu::getMenuId)
- .eq(SysUser::getId, user.getId())
- .like(StringUtils.isNotBlank(request.getKey()), SysMenu::getMenuName, request.getKey())
+ .eq(StringUtils.isNotBlank(request.getKey()), SysUser::getId, user.getId())
.orderByAsc(SysMenu::getListSort);
//
- List<SysMenu> menuList = sysUserRoleMapper.selectJoinList(SysMenu.class, wrapper);
+ List<SysMenu> menuList = sysUserRoleService.selectJoinList(SysMenu.class, wrapper);
log.info("userinfos:{}", menuList);
return create(menuList);
}
@@ -114,6 +113,15 @@
return "鎵归噺鍒犻櫎鎴愬姛";
}
+ @Override
+ public Boolean saveMenu(SysMenu sysMenu) {
+ this.save(sysMenu);
+ SysUser user = UserInfoUtils.get();
+ SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getId()));
+ sysRoleMenuService.save(new SysRoleMenu(one.getRoleId(), sysMenu.getId()));
+ return Boolean.TRUE;
+ }
+
/**
* 灏嗘暟鎹簱涓煡璇㈠嚭鏉ョ殑list闆嗗悎浼犲叆姝ゆ柟娉曞嵆鍙幏寰楁帓鎴愭爲褰㈢粨鏋勭殑list闆嗗悎
@@ -127,7 +135,7 @@
.map(item -> {
item.setChildren(getChildren(item, lists));
return item;
- }).collect(Collectors.toList());
+ }).sorted((o1, o2) -> o1.getListSort() - o2.getListSort()).collect(Collectors.toList());
return deptTreeList;
}
--
Gitblit v1.8.0