Merge branch '20220519' into 'master'

fix(DEFECT-407): 菜单权限修改后未刷新缓存问题

See merge request huang/thingsboard3.3.2!102

@@ -105,6 +105,7 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
     Menu menu = menuDTO.getEntity(Menu.class);
     Menu menu = menuDTO.getEntity(Menu.class);
     int insertCount = baseMapper.insert(menu);
     int insertCount = baseMapper.insert(menu);
     if (insertCount > 0) {
     if (insertCount > 0) {
+      cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
       menu.copyToDTO(menuDTO);
       menu.copyToDTO(menuDTO);
       return menuDTO;
       return menuDTO;
     }
     }
@@ -119,8 +120,8 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
   @Override
   @Override
   @Transactional
   @Transactional
   public MenuDTO updateMenu(String tenantId, boolean isSysAdmin, MenuDTO menuDTO) {
   public MenuDTO updateMenu(String tenantId, boolean isSysAdmin, MenuDTO menuDTO) {
-    Menu menu = baseMapper.selectById(menuDTO.getId());
-    if (menu == null) {
+    Menu oldMenu = baseMapper.selectById(menuDTO.getId());
+    if (oldMenu == null) {
       throw new YtDataValidationException("cannot find menu to update");
       throw new YtDataValidationException("cannot find menu to update");
     } else {
     } else {
       if (!isSysAdmin) {
       if (!isSysAdmin) {
@@ -128,12 +129,12 @@ public class MenuServiceImpl extends AbstractBaseService<MenuMapper, Menu> imple
           throw new AccessDeniedException("You don't have permission to update this menu");
           throw new AccessDeniedException("You don't have permission to update this menu");
         }
         }
       }
       }
-      menuDTO.copyToEntity(menu);
-      baseMapper.updateById(menu);
-      if (!Objects.equals(menuDTO.getPermission(), menu.getPermission())) {
+      if (!Objects.equals(menuDTO.getPermission(), oldMenu.getPermission())) {
         cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
         cacheUtils.invalidateCacheName(FastIotConstants.CacheConfigKey.CACHE_CONFIG_KEY);
       }
       }
-      menu.copyToDTO(menuDTO);
+      menuDTO.copyToEntity(oldMenu);
+      baseMapper.updateById(oldMenu);
+      oldMenu.copyToDTO(menuDTO);
     }
     }
     return menuDTO;
     return menuDTO;
   }
   }