zouxuan 3 tahun lalu
induk
melakukan
8d004dca75

+ 1 - 1
mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -38,7 +38,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		List<SysMenu> sysMenus;
 		List<SysMenu> sysMenusAllList;
 
-		if(sysUser.getTenantId() == -1 || sysUser.getIsSuperAdmin()){
+		if(sysUser.getTenantId() == -1 && sysUser.getIsSuperAdmin()){
 			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 			sysMenusAllList = sysMenuDao.findList(null,menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 		}else {

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/config/PermissionCheckService.java

@@ -27,7 +27,7 @@ public class PermissionCheckService {
 		}
 
 		SysUser user = sysUserFeignService.queryUserInfo();
-		if(user.getTenantId() == -1){
+		if(user.getTenantId() == -1 && user.getIsSuperAdmin()){
 			return true;
 		}