admin权限修改,注册逻辑修改
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import com.ruoyi.common.core.domain.TreeSelect;
|
||||
import com.ruoyi.common.core.domain.entity.SysMenu;
|
||||
import com.ruoyi.system.domain.vo.RouterVo;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 菜单 业务层
|
||||
*
|
||||
@@ -141,4 +142,11 @@ public interface ISysMenuService
|
||||
* @return 结果
|
||||
*/
|
||||
public boolean checkMenuNameUnique(SysMenu menu);
|
||||
|
||||
/**
|
||||
* 查询管理员权限
|
||||
* @return
|
||||
*/
|
||||
|
||||
Set<String> selectAdminMenu();
|
||||
}
|
||||
|
||||
@@ -1,15 +1,6 @@
|
||||
package com.ruoyi.system.service.impl;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.ruoyi.common.constant.Constants;
|
||||
import com.ruoyi.common.constant.UserConstants;
|
||||
import com.ruoyi.common.core.domain.TreeSelect;
|
||||
@@ -24,6 +15,11 @@ import com.ruoyi.system.mapper.SysMenuMapper;
|
||||
import com.ruoyi.system.mapper.SysRoleMapper;
|
||||
import com.ruoyi.system.mapper.SysRoleMenuMapper;
|
||||
import com.ruoyi.system.service.ISysMenuService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 菜单 业务层处理
|
||||
@@ -120,6 +116,28 @@ public class SysMenuServiceImpl implements ISysMenuService
|
||||
}
|
||||
return permsSet;
|
||||
}
|
||||
/**
|
||||
* 查询管理员权限
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Set<String> selectAdminMenu() {
|
||||
Set<String> permsSet = new HashSet<>();
|
||||
List<SysMenu> sysMenus = menuMapper.selectMenuList(new SysMenu());
|
||||
Long caseMenuId =null;
|
||||
if(CollectionUtil.isNotEmpty(sysMenus)){
|
||||
Optional<SysMenu> optional = sysMenus.stream().filter(sysMenu -> sysMenu.getMenuName().equals("案件列表")).findFirst();
|
||||
if(optional.isPresent()){
|
||||
caseMenuId= optional.get().getMenuId();
|
||||
}
|
||||
for (SysMenu sysMenu : sysMenus) {
|
||||
if(!sysMenu.getParentId().equals(caseMenuId)&&StringUtils.isNotEmpty(sysMenu.getPerms())){
|
||||
permsSet.addAll(Arrays.asList(sysMenu.getPerms().trim().split(",")));
|
||||
}
|
||||
}
|
||||
}
|
||||
return permsSet;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据用户ID查询菜单
|
||||
@@ -346,6 +364,8 @@ public class SysMenuServiceImpl implements ISysMenuService
|
||||
return UserConstants.UNIQUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获取路由名称
|
||||
*
|
||||
|
||||
@@ -483,11 +483,11 @@ public class SysUserServiceImpl implements ISysUserService {
|
||||
checkUserDataScope(userId);
|
||||
}
|
||||
// 删除用户与角色关联
|
||||
userRoleMapper.deleteUserRole(userIds);
|
||||
// userRoleMapper.deleteUserRole(userIds);
|
||||
// 删除用户与岗位关联
|
||||
userPostMapper.deleteUserPost(userIds);
|
||||
// userPostMapper.deleteUserPost(userIds);
|
||||
// 删除用户部门关联
|
||||
userDeptMapper.deleteUserByIds(userIds);
|
||||
// userDeptMapper.deleteUserByIds(userIds);
|
||||
int i = userMapper.deleteUserByIds(userIds);
|
||||
for (Long userId : userIds) {
|
||||
// 删除缓存
|
||||
|
||||
Reference in New Issue
Block a user