fix: 修改允许平台管理员查询所有的菜单，用于租户角色菜单分配

@@ -21,8 +21,6 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
-import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
@@ -192,20 +190,20 @@ public class TkAdminController extends BaseController {
       @RequestParam(value = "needButton", required = false, defaultValue = "true")
           boolean needButton)
       throws ThingsboardException {
+    boolean isSysAdminOrPtAdmin = getCurrentUser().isPtSysadmin() || getCurrentUser().isPtAdmin();
     return ResponseEntity.ok(
         menuService.getMyMenus(
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentUserId(),
-            getCurrentUser().isPtSysadmin(),
+            isSysAdminOrPtAdmin,
             getCurrentUser().isPtTenantAdmin(),
             needButton));
   }
 
   @PutMapping("/menu/assign/{tenantId}")
   public void assignMenuToTenant(
-      @RequestBody String[] menuIds, @PathVariable("tenantId") String tenantId)
-      throws ThingsboardException {
-    menuService.assignMenuToTenant(getCurrentUser().getCurrentTenantId(), menuIds);
+      @RequestBody String[] menuIds, @PathVariable("tenantId") String tenantId){
+    menuService.assignMenuToTenant(tenantId, menuIds);
   }
 
   @PostMapping("tenant/updateOrCreateTenant")

@@ -44,11 +44,11 @@ public class SysMenuServiceImpl extends AbstractBaseService<MenuMapper, SysMenuE
   public List<MenuDTO> getMyMenus(
       String tenantId,
       String userId,
-      boolean isSysAdmin,
+      boolean isSysAdminOrPtAdmin,
       boolean isTenantAdmin,
       boolean needButton) {
     List<MenuDTO> menuDTOs;
-    if (isSysAdmin) {
+    if (isSysAdminOrPtAdmin) {
       menuDTOs = baseMapper.selectSysAdminMenu();
     } else if (isTenantAdmin) {
       menuDTOs = baseMapper.selectTenantMenu(tenantId);

@@ -19,7 +19,7 @@ public interface MenuService {
    * @return list 树状menu
    */
   List<MenuDTO> getMyMenus(
-      String tenantId, String userId, boolean isPtSysAdmin, boolean isPtTenantAdmin,boolean needButton);
+      String tenantId, String userId, boolean isPtSysAdmin, boolean isSysAdminOrPtAdmin,boolean needButton);
 
   MenuDTO saveMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);