|
|
@@ -46,13 +46,39 @@ public class MenuService extends ServiceImpl<MenuMapper,MenuEntity> {
|
|
|
*/
|
|
|
public List<String> getAuthCode() {
|
|
|
List<String> list = new ArrayList<>();
|
|
|
- List<MenuEntity> menuEntities = findList(new MenuEntity());
|
|
|
+ List<MenuEntity> menuEntities = findAllList(new MenuEntity());
|
|
|
for (MenuEntity menuEntity : menuEntities) {
|
|
|
- list.add(menuEntity.getPermissionFlag());
|
|
|
+ if (menuEntity.getPermissionFlag() != null && menuEntity.getPermissionFlag() != ""&& menuEntity.getPermissionFlag().length()>0)
|
|
|
+ list.add(menuEntity.getPermissionFlag());
|
|
|
}
|
|
|
return list;
|
|
|
}
|
|
|
+ /**
|
|
|
+ * 查列表
|
|
|
+ */
|
|
|
+ public List<MenuEntity> findAllList(MenuEntity menuEntity) {
|
|
|
+ LoginUser currentUser = UserUtil.getCurrentUser();
|
|
|
+ Integer userId = currentUser.getId();
|
|
|
+ //-999租户管理员 -9999超级管理员 2普通用户
|
|
|
+ String userType = currentUser.getType();
|
|
|
+ String tenantId = currentUser.getTenantId();
|
|
|
+ String name = menuEntity.getName();
|
|
|
+ menuEntity.setTenantId(tenantId);
|
|
|
+ List<MenuEntity> menuEntities = new ArrayList<>();
|
|
|
+ switch (userType) {
|
|
|
+ case "-9999"://超级管理员查询所有系统菜单
|
|
|
+ menuEntities = menuMapper.findList(menuEntity);
|
|
|
+ break;
|
|
|
+ case "-999"://租户管理员查询租户菜单
|
|
|
+ menuEntities = menuMapper.findTenantList(menuEntity);
|
|
|
+ break;
|
|
|
+ default://普通用户按角色查询租户菜单
|
|
|
+ menuEntities = menuMapper.findUserList(name,tenantId,userId);
|
|
|
+ break;
|
|
|
+ }
|
|
|
|
|
|
+ return menuEntities;
|
|
|
+ }
|
|
|
/**
|
|
|
* 查列表
|
|
|
*/
|
wangyangyang