فهرست منبع

解决总管菜单显示的bug

oyq28 3 سال پیش
والد
کامیت
ef313ee94d

+ 4 - 1
imcs-admin-boot/imcs-authority-controller/src/main/java/com/github/zuihou/authority/controller/auth/MenuController.java

@@ -8,6 +8,7 @@ import com.github.zuihou.authority.entity.auth.Menu;
 import com.github.zuihou.authority.service.auth.MenuService;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.controller.SuperCacheController;
+import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.Wraps;
 import com.github.zuihou.log.annotation.SysLog;
 import com.github.zuihou.security.annotation.LoginUser;
@@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Locale;
 
 
 /**
@@ -99,7 +101,8 @@ public class MenuController extends SuperCacheController<MenuService, Long, Menu
     public R<List<Menu>> allTenantTree(
             @RequestParam(value = "tenantCode", required = true) String tenantCode) {
         tenantCode = Base64.decodeStr(tenantCode);
-        List<Menu> list = menuService.findTenantMenu(tenantDatabasePrefix, tenantCode);
+        boolean bool = BaseContextHandler.getName().equals("平台超管");
+        List<Menu> list = bool? menuService.findTenantMenu(tenantDatabasePrefix, tenantCode) : menuService.findTenantVisibleMenu(tenantDatabasePrefix, tenantCode,"", BaseContextHandler.getUserId());
         return success(TreeUtil.buildTree(list));
     }
 }