From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Jul 2020 09:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java
index e5c747a..9c95f74 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysMenuServiceImpl.java
@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.context.ClientContextHolder;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysMenu;
@@ -67,7 +68,11 @@
@Override
public List<SysMenu> findByRoleCodes(Set<String> roleCodes, Integer type) {
- return roleMenuService.findMenusByRoleCodes(roleCodes, type, ClientContextHolder.getClient());
+ String tentid=ClientContextHolder.getClient();
+ if (roleCodes.contains(CommonConstant.SYSTEM_ADMIN_ROLE_CODE)) {
+ tentid="";
+ }
+ return roleMenuService.findMenusByRoleCodes(roleCodes, type,tentid);
}
/**
--
Gitblit v1.8.0