fix:1.去掉组织不能为空提示 2.普通租户菜单权限问题 3.用户账号时效为null不修改问题 4.前端菜单权限

feat:1.重置密码需求

@@ -63,7 +63,7 @@ public class TkRoleController extends BaseController {
 
 
   @DeleteMapping
   @DeleteMapping
   @PreAuthorize(
   @PreAuthorize(
-      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:role:delete'})")
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:tenant:role:delete','api:yt:custom:role:delete'})")
   public void deleteRole(@RequestBody String[] ids) throws ThingsboardException {
   public void deleteRole(@RequestBody String[] ids) throws ThingsboardException {
     roleService.deleteRole(ids, getCurrentUser().getCurrentTenantId());
     roleService.deleteRole(ids, getCurrentUser().getCurrentTenantId());
   }
   }
@@ -73,6 +73,7 @@ public class TkRoleController extends BaseController {
     return roleService.getPermissions(
     return roleService.getPermissions(
         getCurrentUser().isPtSysadmin(),
         getCurrentUser().isPtSysadmin(),
         getCurrentUser().isPtTenantAdmin(),
         getCurrentUser().isPtTenantAdmin(),
+        getCurrentUser().isPtCommonTenant(),
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().getCurrentUserId());
         getCurrentUser().getCurrentUserId());
   }
   }
@@ -88,7 +89,7 @@ public class TkRoleController extends BaseController {
 
 
   @PostMapping("save_with_menu")
   @PostMapping("save_with_menu")
   @PreAuthorize(
   @PreAuthorize(
-      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:role:saveOrUpdateRoleInfoWithMenu:post','api:yt:role:saveOrUpdateRoleInfoWithMenu:update'})")
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN'},{'api:yt:tenant:role:post','api:yt:tenant:role:update'})")
   public RoleDTO saveOrUpdateRoleInfoWithMenu(@RequestBody RoleReqDTO roleReqDTO)
   public RoleDTO saveOrUpdateRoleInfoWithMenu(@RequestBody RoleReqDTO roleReqDTO)
       throws ThingsboardException {
       throws ThingsboardException {
     if (getCurrentUser().isPtAdmin() && null == roleReqDTO.getRoleType()) {
     if (getCurrentUser().isPtAdmin() && null == roleReqDTO.getRoleType()) {

@@ -361,14 +361,13 @@ public class TkUserController extends AbstractUserAccount {
             orgIds));
             orgIds));
   }
   }
 
 
-  @PostMapping("/reset_password/{userId}")
+  @PostMapping("/reset_password/{userId}/{level}")
   @ApiOperation(value = "重置客户密码")
   @ApiOperation(value = "重置客户密码")
   @PreAuthorize(
   @PreAuthorize(
       "@check.checkPermissions({'SYS_ADMIN','TENANT_ADMIN'},{'api:yt:user:resetPassword'})")
       "@check.checkPermissions({'SYS_ADMIN','TENANT_ADMIN'},{'api:yt:user:resetPassword'})")
-  public ResponseResult resetPassword(@PathVariable("userId") String userId)
+  public ResponseResult resetPassword(@PathVariable("userId") String userId,@PathVariable("level") Integer level)
       throws ThingsboardException {
       throws ThingsboardException {
     boolean isSysAdmin = getCurrentUser().isSystemAdmin();
     boolean isSysAdmin = getCurrentUser().isSystemAdmin();
-    Integer level = isSysAdmin ? 1 : 3;
     // 检查平台、客户账号
     // 检查平台、客户账号
     UserDTO user = userService.checkAccount(userId, level);
     UserDTO user = userService.checkAccount(userId, level);
     if (null == user) {
     if (null == user) {

@@ -47,7 +47,8 @@ public class PermissionTools {
         }
         }
 
 
         if (needPermission != null && !needPermission.isEmpty()) {
         if (needPermission != null && !needPermission.isEmpty()) {
-            Set<String> userPermissions = roleService.getPermissions(securityUser.isPtSysadmin(), securityUser.isPtTenantAdmin(), securityUser.getCurrentTenantId(), securityUser.getCurrentUserId());
+            Set<String> userPermissions = roleService.getPermissions(securityUser.isPtSysadmin(), securityUser.isPtTenantAdmin(),
+                    securityUser.isPtCommonTenant(), securityUser.getCurrentTenantId(), securityUser.getCurrentUserId());
             if (userPermissions == null || userPermissions.isEmpty()) {
             if (userPermissions == null || userPermissions.isEmpty()) {
                 return false;
                 return false;
             }
             }

@@ -37,8 +37,6 @@ public class ConvertConfigDTO extends TenantDTO {
   @ApiModelProperty(value = "数据源内容")
   @ApiModelProperty(value = "数据源内容")
   private JsonNode datasourceContent;
   private JsonNode datasourceContent;
 
 
-  @ApiModelProperty(value = "组织id")
-  @NotEmpty(message = "组织不能为空或者空字符串")
   private String organizationId;
   private String organizationId;
 
 
   private transient Integer nodeType;
   private transient Integer nodeType;

@@ -33,6 +33,7 @@ public class SysUserEntity extends TenantBaseEntity {
 
 
   private boolean enabled = true;
   private boolean enabled = true;
 
 
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
   private LocalDateTime accountExpireTime;
   private LocalDateTime accountExpireTime;
 
 
   private String deptId;
   private String deptId;

@@ -99,7 +99,7 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
 
 
   @Override
   @Override
   public Set<String> getPermissions(
   public Set<String> getPermissions(
-      boolean isSysadmin, boolean isTenantAdmin, String tenantId, String useerId) {
+      boolean isSysadmin, boolean isTenantAdmin,boolean isCommonTenant, String tenantId, String useerId) {
     Set<String> permissions = Sets.newHashSet();
     Set<String> permissions = Sets.newHashSet();
     Set<String> allPermission;
     Set<String> allPermission;
     String cacheKey;
     String cacheKey;
@@ -110,7 +110,7 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
       cachePresent = optionalPermission.isPresent();
       cachePresent = optionalPermission.isPresent();
       allPermission = optionalPermission.orElseGet(menuMapper::getAllPermission);
       allPermission = optionalPermission.orElseGet(menuMapper::getAllPermission);
-    } else if (isTenantAdmin) {
+    }else if (isTenantAdmin&&!isCommonTenant) {
       cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + tenantId;
       cacheKey = FastIotConstants.CacheConfigKey.USER_PERMISSION_PREFIX + tenantId;
       Optional<Set<String>> optionalPermission =
       Optional<Set<String>> optionalPermission =
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
           cacheUtils.get(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY, cacheKey);
@@ -126,7 +126,7 @@ public class SysRoleServiceImpl extends AbstractBaseService<RoleMapper, SysRoleE
           optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByUserId(useerId));
           optionalPermission.orElseGet(() -> menuMapper.getAllPermissionsByUserId(useerId));
     }
     }
     if (cachePresent) {
     if (cachePresent) {
-      return allPermission;
+       return allPermission;
     } else {
     } else {
       allPermission.forEach(
       allPermission.forEach(
           permission -> permissions.addAll(Sets.newHashSet(permission.split(","))));
           permission -> permissions.addAll(Sets.newHashSet(permission.split(","))));

@@ -14,7 +14,7 @@ public interface RoleService {
 
 
   boolean deleteRole(String[] roleIds,String tenantId);
   boolean deleteRole(String[] roleIds,String tenantId);
 
 
-  Set<String> getPermissions(boolean isSysadmin,boolean isTenantAdmin,String tenantId,String useerId);
+  Set<String> getPermissions(boolean isSysadmin,boolean isTenantAdmin,boolean isCommonTenant,String tenantId,String useerId);
 
 
   void updateRoleStatus(String roleId, int status,boolean isSysadmin,String tenantId);
   void updateRoleStatus(String roleId, int status,boolean isSysadmin,String tenantId);