|
@@ -17,6 +17,7 @@ import javax.annotation.Resource;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.google.common.collect.Lists.newArrayList;
|
|
|
|
|
@@ -277,28 +278,30 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
|
|
|
Integer userId = currentUser.getId();
|
|
|
//-999租户管理员 -9999超级管理员 2普通用户
|
|
|
String userType = currentUser.getType();
|
|
|
- List<MenuEntity> menuEntities= new ArrayList<>();
|
|
|
+ List<MenuEntity> menuEntities = new ArrayList<>();
|
|
|
switch (userType) {
|
|
|
-// case "1"://超级管理员查询所有系统菜单
|
|
|
-// menuEntities = menuMapper.findAllFirstMenu();
|
|
|
-// break;
|
|
|
-// case "2"://普通用户按角色查询租户菜单
|
|
|
-// menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
|
|
|
-// break;
|
|
|
case "-9999"://超级管理员查询所有系统菜单
|
|
|
menuEntities = menuMapper.findAllFirstMenu();
|
|
|
break;
|
|
|
case "-999"://租户管理员查询租户菜单
|
|
|
menuEntities = menuMapper.findTenantFirstMenu(currentUser.getTenantId());
|
|
|
break;
|
|
|
- default: //其他租户用户暂时不区分类型
|
|
|
- menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(),userId);
|
|
|
+ default: //其他租户用户暂时不区分类型
|
|
|
+ menuEntities = menuMapper.findUserFirstMenu(currentUser.getTenantId(), userId);
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
+ List<MenuEntity> menuAllEntities = menuMapper.findAllFirstMenu();
|
|
|
+ Map<Long, MenuEntity> map = menuAllEntities.stream().collect(Collectors.toMap(MenuEntity::getId, item -> item));
|
|
|
+ for (MenuEntity item : menuEntities) {
|
|
|
+ item.setIsOwner(1);
|
|
|
+ map.remove(item.getId());
|
|
|
+ }
|
|
|
+ for (MenuEntity item : map.values()) {
|
|
|
+ item.setIsOwner(0);
|
|
|
+ menuEntities.add(item);
|
|
|
+ }
|
|
|
return menuEntities;
|
|
|
}
|
|
|
-
|
|
|
public List<MenuEntity> findUserMenu(String appId) {
|
|
|
LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
Integer userId = currentUser.getId();
|