fix: 修改云腾租户相关角色Bug

+package org.thingsboard.server.controller.yunteng;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.exception.FastIotException;
+import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.yunteng.service.MenuService;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("api/yt/menu")
+public class YtMenuController extends BaseController {
+
+  private final MenuService menuService;
+
+  @GetMapping("/me/menus")
+  public List<MenuDTO> getMyMenus() throws ThingsboardException {
+    return menuService.getMyMenus(
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getCurrentUserId(),
+        getCurrentUser().isPtSysadmin(),
+        getCurrentUser().isPtTenantAdmin());
+  }
+
+  @GetMapping("getMenuIdsByRoleId/{roleId}")
+  public Set<String> getMenuIdsByRoleId(@PathVariable("roleId") String roleId) {
+    return menuService.getMenuIdsByRoleId(roleId);
+  }
+
+  @PutMapping("/manage/assign/{roleId}")
+  public void assignMenuToRole(
+      @RequestBody String[] menuIds, @PathVariable("roleId") String roleId) {
+    menuService.assignMenuToRole(menuIds, roleId);
+  }
+
+  @GetMapping("{id}")
+  public ResponseEntity<MenuDTO> getMenus(@PathVariable("id") String id) {
+    return ResponseEntity.of(menuService.getMenu(id));
+  }
+
+  @PutMapping
+  //  @PreAuthorize("@iot.check('menu:update')")
+  public MenuDTO updateMenu(@RequestBody MenuDTO menuDTO) throws ThingsboardException {
+    Assert.notNull(menuDTO.getId(), "menuId cannot be null");
+    return menuService.updateMenu(
+        getCurrentUser().getCurrentTenantId(), getCurrentUser().isPtSysadmin(), menuDTO);
+  }
+
+  @PostMapping
+  @PreAuthorize("hasAnyRole('SYS_ADMIN','TENANT_ADMIN')")
+  public ResponseEntity<MenuDTO> saveMenu(@RequestBody MenuDTO menuDTO)
+      throws FastIotException, ThingsboardException {
+    MenuDTO newMenuDTO =
+        menuService.saveMenu(
+            getCurrentUser().getCurrentTenantId(), getCurrentUser().isPtSysadmin(), menuDTO);
+    return Optional.ofNullable(newMenuDTO)
+        .map(
+            dto -> {
+              URI location =
+                  ServletUriComponentsBuilder.fromCurrentRequest()
+                      .path("/{id}")
+                      .buildAndExpand(newMenuDTO.getId())
+                      .toUri();
+              return ResponseEntity.created(location).body(newMenuDTO);
+            })
+        .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+  }
+
+  @DeleteMapping
+  @PreAuthorize("hasAnyRole('SYS_ADMIN','TENANT_ADMIN')")
+  public void deleteMenus(@RequestBody String[] ids) throws ThingsboardException {
+    if (ids.length == 0) {
+      throw new DataValidationException("please provide menu ids to delete");
+    }
+    menuService.deleteMenus(getCurrentUser().getCurrentTenantId(), ids);
+  }
+}

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
@@ -54,7 +55,7 @@ public class YtTenantServiceImpl extends AbstractBaseService<TenantMapper, Tenan
   public PageData<TenantDTO> page(Map<String, Object> queryMap) {
   public PageData<TenantDTO> page(Map<String, Object> queryMap) {
     IPage<Tenant> tenantIPage = getPage(queryMap, "create_time", true);
     IPage<Tenant> tenantIPage = getPage(queryMap, "create_time", true);
     IPage<TenantDTO> userPage =
     IPage<TenantDTO> userPage =
-        baseMapper.getTenantPage(tenantIPage, (String) queryMap.get("tenantName"));
+        baseMapper.getTenantPage(tenantIPage, (String) queryMap.get("tenantName"), EntityId.NULL_UUID.toString());
     PageData<TenantDTO> pageData = getPageData(userPage, TenantDTO.class);
     PageData<TenantDTO> pageData = getPageData(userPage, TenantDTO.class);
     determineTenantStatus(pageData.getItems());
     determineTenantStatus(pageData.getItems());
     return pageData;
     return pageData;

@@ -14,5 +14,8 @@ import java.util.Set;
 public interface TenantMapper extends BaseMapper<Tenant> {
 public interface TenantMapper extends BaseMapper<Tenant> {
   Set<String> getTenantIdsByTenantIds(@Param("tenantIds") Collection<String> tenantIds);
   Set<String> getTenantIdsByTenantIds(@Param("tenantIds") Collection<String> tenantIds);
 
 
-  IPage<TenantDTO> getTenantPage(IPage<?> page, @Param("tenantName") String tenantName);
+  IPage<TenantDTO> getTenantPage(
+      IPage<?> page,
+      @Param("tenantName") String tenantName,
+      @Param("defaultTenantId") String defaultTenantId);
 }
 }

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
-
-
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
-
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
 
 
 public interface MenuService {
 public interface MenuService {
-
   /**
   /**
    * sysadmin获取所有的menu，但是不获取租户自己创建的menu
    * sysadmin获取所有的menu，但是不获取租户自己创建的menu
    *
    *
@@ -22,17 +18,18 @@ public interface MenuService {
    *
    *
    * @return list 树状menu
    * @return list 树状menu
    */
    */
-  List<MenuDTO> getMyMenus(String tenantId,String userId,boolean isSysAdmin,boolean isTenantAdmin);
+  List<MenuDTO> getMyMenus(
+      String tenantId, String userId, boolean isPtSysAdmin, boolean isPtTenantAdmin);
 
 
-  MenuDTO saveMenu(String tenantId,boolean isSysAdmin,MenuDTO menuDTO);
+  MenuDTO saveMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);
 
 
   Optional<MenuDTO> getMenu(String id);
   Optional<MenuDTO> getMenu(String id);
 
 
-  MenuDTO updateMenu(String tenantId,boolean isSysAdmin,MenuDTO menuDTO);
+  MenuDTO updateMenu(String tenantId, boolean isPtSysAdmin, MenuDTO menuDTO);
 
 
-  boolean deleteMenus(String tenantId,String[] ids);
+  boolean deleteMenus(String tenantId, String[] ids);
 
 
-  boolean assignMenuToTenant(String tenantId,String[] menuId);
+  boolean assignMenuToTenant(String tenantId, String[] menuId);
 
 
   boolean assignMenuToRole(String[] menuId, String roleId);
   boolean assignMenuToRole(String[] menuId, String roleId);
 
 

@@ -24,7 +24,7 @@
         SELECT id, tenant_id,name, enabled, description, default_config, tenant_expire_time, create_time,icon
         SELECT id, tenant_id,name, enabled, description, default_config, tenant_expire_time, create_time,icon
         FROM sys_tenant
         FROM sys_tenant
         <where>
         <where>
-            tenant_id != 'DEFAULT_SYS_ADMIN_TENANT_CODE'
+            tenant_id != #{defaultTenantId}
             <if test="tenantName!=null">
             <if test="tenantName!=null">
                AND name LIKE CONCAT('%',#{tenantName}::TEXT,'%')
                AND name LIKE CONCAT('%',#{tenantName}::TEXT,'%')
             </if>
             </if>