|
|
@@ -11,8 +11,10 @@ import javax.validation.constraints.NotEmpty;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.ozs.common.core.domain.entity.SysMenu;
|
|
|
import com.ozs.common.core.domain.vo.SysRoleRequestVo;
|
|
|
import com.ozs.common.core.domain.vo.SysUserVo;
|
|
|
+import com.ozs.system.domain.SysRoleMenu;
|
|
|
import com.ozs.system.service.DataScoreUtil;
|
|
|
import com.ozs.system.service.ISysMenuService;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@@ -120,8 +122,8 @@ public class SysRoleController extends BaseController
|
|
|
// roleService.checkRoleDataScope(roleId);
|
|
|
SysRole sysRole = roleService.selectRoleById(roleId);
|
|
|
if (sysRole.getRoleName().equals(("超级管理员"))){
|
|
|
- List<SysRole> list = roleService.list();
|
|
|
- List<Long> collect = list.stream().map(SysRole::getRoleId).collect(Collectors.toList());
|
|
|
+ List<SysMenu> list = menuService.list();
|
|
|
+ List<Long> collect = list.stream().map(SysMenu::getMenuId).collect(Collectors.toList());
|
|
|
Long[] strArr = collect.toArray(new Long[collect.size()]);
|
|
|
sysRole.setMenuIds(strArr);
|
|
|
}else {
|
gao.qiang