From 2f3d3fb97bd4ebdc00c40a2774465c8b3487b6d1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 02 四月 2025 17:14:27 +0800
Subject: [PATCH] bug修改

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java |   88 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java
index cdb4916..96ba621 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysRoleServiceImpl.java
@@ -1,5 +1,6 @@
 package com.sinata.system.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sinata.common.annotation.DataScope;
@@ -12,6 +13,7 @@
 import com.sinata.common.exception.ServiceException;
 import com.sinata.common.utils.BeanUtils;
 import com.sinata.common.utils.CollUtils;
+import com.sinata.common.utils.DateUtils;
 import com.sinata.common.utils.SecurityUtils;
 import com.sinata.common.utils.StringUtils;
 import com.sinata.common.utils.spring.SpringUtils;
@@ -36,6 +38,7 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -465,14 +468,22 @@
     @Override
     public void saveRole(SysRoleDTO dto) {
         SysRole sysRole = BeanUtils.copyBean(dto, SysRole.class);
+
         if (!this.checkRoleNameUnique(sysRole)) {
             throw new ServiceException("保存角色'" + sysRole.getRoleName() + "'失败,角色名称已存在");
         }
-        if (Objects.nonNull(sysRole.getRoleId())) {
+        if (Objects.isNull(sysRole.getRoleId())) {
+            sysRole.setCreateBy(SecurityUtils.getUserId().toString());
+            sysRole.setCreateTime(DateUtils.getNowDate());
             baseMapper.insert(sysRole);
         } else {
+            // 删除角色与菜单关联
+            roleMenuMapper.deleteRoleMenuByRoleId(sysRole.getRoleId());
+            sysRole.setUpdateBy(SecurityUtils.getUserId().toString());
+            sysRole.setUpdateTime(DateUtils.getNowDate());
             baseMapper.updateById(sysRole);
         }
+        insertRoleMenu(sysRole);
     }
 
     /**
@@ -502,18 +513,21 @@
     @Override
     public List<SysRoleVO> getManageRoleList(LoginUser loginUser) {
         List<SysRoleVO> res = CollUtils.emptyList();
-        Long roleId = loginUser.getUser().getRoleId();
-        SysRole role = this.getById(roleId);
-        if (Objects.nonNull(role)) {
-            List<SysRole> list = this.lambdaQuery().in(SysRole::getRoleId, Arrays.asList(role.getManageRoleIdStr().split(","))).list();
-            if (CollUtils.isNotEmpty(list)) {
-                res = BeanUtils.copyToList(list, SysRoleVO.class);
+        Long userId = loginUser.getUserId();
+        SysUserRole sysUserRole = userRoleMapper.selectOne(Wrappers.lambdaQuery(SysUserRole.class).eq(SysUserRole::getUserId, userId).last("LIMIT 1"));
+        if (Objects.nonNull(sysUserRole)) {
+            SysRole role = this.getById(sysUserRole.getRoleId());
+            if (Objects.nonNull(role)) {
+                List<SysRole> list = this.lambdaQuery().in(SysRole::getRoleId, Arrays.asList(role.getManageRoleIdStr().split(","))).list();
+                if (CollUtils.isNotEmpty(list)) {
+                    res = BeanUtils.copyToList(list, SysRoleVO.class);
+                }
             }
         }
         return res;
     }
 
-    @Override
+    /*@Override
     public List<SysMenu> getMenuLevelList(List<Long> menusId) {
         //获取当前的权限菜单
         List<SysMenu> all = menuMapper.getAllInIds(menusId);
@@ -540,6 +554,39 @@
             menu.setChildren(collect);
         }
         return s1;
+    }*/
+    @Override
+    public List<SysMenu> getMenuLevelList(List<Long> menusId) {
+        //获取当前的权限菜单
+        List<SysMenu> all = menuMapper.getAllInIds(menusId);
+
+        // 第一级
+        List<SysMenu> s1 = all.stream().filter(e -> e.getMenuType().equals("M"))
+                .collect(Collectors.toList());
+        // 构建以 parentId 为键的 Map
+        Map<Long, List<SysMenu>> menuMap = all.stream()
+                .collect(Collectors.groupingBy(SysMenu::getParentId));
+        //封装树形层级
+        buildMenuTree(menuMap, s1);
+        return s1;
+    }
+
+    /**
+     * 封装树形层级
+     *
+     * @param menuMap
+     * @param s1
+     */
+    public void buildMenuTree(Map<Long, List<SysMenu>> menuMap, List<SysMenu> s1) {
+        for (SysMenu sysMenu : s1) {
+            // 获取当前菜单的子级
+            List<SysMenu> children = menuMap.getOrDefault(sysMenu.getMenuId(), new ArrayList<>());
+            sysMenu.setChildren(children);
+            //移除当前菜单
+            menuMap.remove(sysMenu.getMenuId());
+            // 递归设置子级菜单
+            buildMenuTree(menuMap, children);
+        }
     }
 
     @Override
@@ -554,4 +601,29 @@
         // 获取当前的权限菜单(有层级)
         return this.getMenuLevelList(menusId);
     }
+
+    /**
+     * 角色列表
+     *
+     * @return
+     */
+    @Override
+    public List<SysRoleVO> queryList() {
+        List<SysRole> list = list();
+        return BeanUtils.copyToList(list, SysRoleVO.class);
+    }
+
+    /**
+     * 用户菜单权限集合
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public Set<Long> getMenuIdSets(Long userId) {
+        SysRole sysRole = roleMapper.selectRoleByUserId(userId);
+        // 获取当前角色的菜单列表
+        List<SysMenu> menus = menuMapper.selectListByRoleId(sysRole.getRoleId());
+        return menus.stream().map(SysMenu::getMenuId).collect(Collectors.toSet());
+    }
 }

--
Gitblit v1.7.1