用户菜单修改

user_center/src/main/java/com/huaxu/service/MenuService.java

@@ -53,15 +53,15 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		menuEntity.setTenantId(currentUser.getTenantId());
 		List<MenuEntity> menuEntities = new ArrayList<>();
 		switch (userType) {
-			case "1"://超级管理员查询所有系统菜单
+			case "-9999"://超级管理员查询所有系统菜单
 				menuEntities = menuMapper.findList(menuEntity);
 				break;
-			case "2"://普通用户按角色查询租户菜单
-				menuEntities = menuMapper.findUserList(menuEntity);
-				break;
 			case "-999"://租户管理员查询租户菜单
 				menuEntities = menuMapper.findTenantList(menuEntity);
 				break;
+			default://普通用户按角色查询租户菜单
+				menuEntities = menuMapper.findUserList(menuEntity);
+				break;
 		}
 
 		List<MenuEntity> menuTree = getMenuTree(menuEntities, Long.valueOf(0), 1);
@@ -101,13 +101,13 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		String userType = currentUser.getType();
 		List<MenuEntity> menuEntities = new ArrayList<>();
 		switch (userType) {
-			case "1"://超级管理员查询所有系统菜单
+			case "-9999"://超级管理员查询所有系统菜单
 				menuEntities = menuMapper.findMenuByParentIds(ids);
 				break;
-			case "2"://普通用户按角色查询租户菜单
+			case "-999"://租户管理员查询租户菜单
 				menuEntities = menuMapper.findTenantMenuByParentIds(currentUser.getTenantId(), ids);
 				break;
-			case "-999"://租户管理员查询租户菜单
+			default://普通用户按角色查询租户菜单
 				menuEntities = menuMapper.findTenantMenuByParentIds(currentUser.getTenantId(), ids);
 				break;
 		}
@@ -125,13 +125,13 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		boolean isOk = false;
 		for(Long id : ids) {
 			switch (userType) {
-				case "1"://超级管理员直接删除系统菜单
+				case "-9999"://超级管理员直接删除系统菜单
 					isOk = this.removeById(id);
 					break;
-				case "2"://普通用户按角色查询租户菜单
+				case "-999"://租户管理员查询租户菜单
 					isOk = menuMapper.updateState(id);
 					break;
-				case "-999"://租户管理员查询租户菜单
+				default://普通用户按角色查询租户菜单
 					isOk = menuMapper.updateState(id);
 					break;
 			}
@@ -149,13 +149,13 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		String userType = currentUser.getType();
 		boolean isOk = false;
 		switch (userType) {
-			case "1"://超级管理员直接删除系统菜单
+			case "-9999"://超级管理员直接删除系统菜单
 				isOk = this.removeById(id);
 				break;
-			case "2"://普通用户按角色查询租户菜单
+			case "-999"://租户管理员查询租户菜单
 				isOk = menuMapper.updateState(id);
 				break;
-			case "-999"://租户管理员查询租户菜单
+			default://普通用户按角色查询租户菜单
 				isOk = menuMapper.updateState(id);
 				break;
 		}
@@ -195,13 +195,13 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		}
 		boolean isOk = false;
 		switch (userType) {
-			case "1"://超级管理员查询所有系统菜单
+			case "-9999"://超级管理员查询所有系统菜单
 				isOk = this.updateById(menu);
 				break;
-			case "2"://普通用户按角色查询租户菜单
+			case "-999"://租户管理员查询租户菜单
 				isOk = tenantMenuMapper.updateById(tenantMenuEntity) > 0 ? true : false;
 				break;
-			case "-999"://租户管理员查询租户菜单
+			default://普通用户按角色查询租户菜单
 				isOk = tenantMenuMapper.updateById(tenantMenuEntity) > 0 ? true : false;
 				break;
 		}
@@ -217,13 +217,13 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		String userType = currentUser.getType();
 		MenuEntity menuEntity = new MenuEntity();
 		switch (userType) {
-			case "1"://超级管理员查询所有系统菜单
+			case "-9999"://超级管理员查询所有系统菜单
 				menuEntity = menuMapper.findMenuById(id);;
 				break;
-			case "2"://普通用户按角色查询租户菜单
+			case "-999"://租户管理员查询租户菜单
 				menuEntity = menuMapper.findUserMenuById(currentUser.getTenantId(),id);
 				break;
-			case "-999"://租户管理员查询租户菜单
+			default://普通用户按角色查询租户菜单
 				menuEntity = menuMapper.findUserMenuById(currentUser.getTenantId(),id);
 				break;
 		}
@@ -243,12 +243,12 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 //			case "2"://普通用户按角色查询租户菜单
 //				menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
 //				break;
-			case "-999"://租户管理员查询租户菜单
-				menuEntities = menuMapper.findTenantFirstMenu(currentUser.getTenantId());
-				break;
 			case "-9999"://超级管理员查询所有系统菜单
 				menuEntities = menuMapper.findAllFirstMenu();
 				break;
+			case "-999"://租户管理员查询租户菜单
+				menuEntities = menuMapper.findTenantFirstMenu(currentUser.getTenantId());
+				break;
 			default:	//其他租户用户暂时不区分类型
 				menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
 				break;
@@ -265,15 +265,15 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
 		List<MenuEntity> menuEntities= new ArrayList<>();
 
 		switch (userType) {
-			case "1"://超级管理员查询所有系统菜单
+			case "-9999"://超级管理员查询所有系统菜单
 				menuEntities = menuMapper.findSystemUserMenu(appId);
 				break;
-			case "2"://普通用户按角色查询租户菜单
-				menuEntities = menuMapper.findUserMenu(currentUser.getTenantId(),userId, appId);
-				break;
 			case "-999"://租户管理员查询租户菜单
 				menuEntities = menuMapper.findTenantUserMenu(currentUser.getTenantId(),appId);
 				break;
+			default://普通用户按角色查询租户菜单
+				menuEntities = menuMapper.findUserMenu(currentUser.getTenantId(),userId, appId);
+				break;
 		}
 		List<MenuEntity> menuTree = getMenuTree(menuEntities, Long.valueOf(0), 1);
 		return menuTree;