data

src/main/java/com/boot/security/server/controller/PermissionController.java

@@ -127,7 +127,15 @@ public class PermissionController {
 	@ApiOperation(value = "所有菜单")
 	@PreAuthorize("hasAuthority('sys:menu:query')")
 	public JSONArray permissionsAll() {
-		List<Permission> permissionsAll = permissionDao.listAll();
+		//获取当前登录用户，如果是admin用户则展示所有权限，否则只能看到当前用户拥有的权限
+		LoginUser loginUser = UserUtil.getLoginUser();
+		List<Permission> permissionsAll =null;
+		if(loginUser.getId().intValue()==1){
+			permissionsAll = permissionDao.listAll();
+		}else {
+			permissionsAll = loginUser.getPermissions();
+		}
+		//List<Permission> permissionsAll = permissionDao.listAll();
 		JSONArray array = new JSONArray();
 		setPermissionsTree(0L, permissionsAll, array);
 

src/main/java/com/boot/security/server/controller/RoleController.java

@@ -2,6 +2,8 @@ package com.boot.security.server.controller;
 
 import java.util.List;
 
+import com.boot.security.server.dto.LoginUser;
+import com.boot.security.server.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -55,10 +57,16 @@ public class RoleController {
 	@ApiOperation(value = "角色列表")
 	@PreAuthorize("hasAuthority('sys:role:query')")
 	public PageTableResponse listRoles(PageTableRequest request) {
+		//查询角色列表时，如果是admin用户显示所有角色，否则只显示除admin之外的角色
+		LoginUser loginUser = UserUtil.getLoginUser();
+		Long id = loginUser.getId();
 		return new PageTableHandler(new CountHandler() {
 
 			@Override
 			public int count(PageTableRequest request) {
+				if (id!=1){
+					return roleDao.count(request.getParams())-1;
+				}
 				return roleDao.count(request.getParams());
 			}
 		}, new ListHandler() {
@@ -66,6 +74,13 @@ public class RoleController {
 			@Override
 			public List<Role> list(PageTableRequest request) {
 				List<Role> list = roleDao.list(request.getParams(), request.getOffset(), request.getLimit());
+				if (id!=1){
+					for (Role role : list) {
+						 if(role.getId().intValue()==1){
+						 	list.remove(role);
+						 }
+					}
+				}
 				return list;
 			}
 		}).handle(request);