Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot into feature/noticews

# Conflicts:
#	src/main/java/com/youlai/boot/module/websocket/service/OnlineUserService.java

src/main/java/com/youlai/boot/system/service/LogService.java

@@ -25,7 +25,7 @@ public interface LogService extends IService<Log> {
      * @param queryParams 查询参数
      * @return
      */
-    Page<LogPageVO> listPagedLogs(LogPageQuery queryParams);
+    Page<LogPageVO> getLogPage(LogPageQuery queryParams);
 
 
     /**

src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java

@@ -36,8 +36,8 @@ public class LogServiceImpl extends ServiceImpl<LogMapper, Log>
      * @return
      */
     @Override
-    public Page<LogPageVO> listPagedLogs(LogPageQuery queryParams) {
-        return this.baseMapper.listPagedLogs(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
+    public Page<LogPageVO> getLogPage(LogPageQuery queryParams) {
+        return this.baseMapper.getLogPage(new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
                 queryParams);
     }
 

src/main/java/com/youlai/boot/system/service/impl/MenuServiceImpl.java

@@ -268,9 +268,32 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
                 roleMenuService.refreshRolePermsCache();
             }
         }
+        // 修改菜单如果有子菜单，则更新子菜单的树路径
+        updateChildrenTreePath(entity.getId(), treePath);
         return result;
     }
 
+    /**
+     * 更新子菜单树路径
+     * @param id 当前菜单ID
+     * @param treePath 当前菜单树路径
+     */
+    private void updateChildrenTreePath(Long id, String treePath) {
+        List<Menu> children = this.list(new LambdaQueryWrapper<Menu>().eq(Menu::getParentId, id));
+        if (CollectionUtil.isNotEmpty(children)) {
+            // 子菜单的树路径等于父菜单的树路径加上父菜单ID
+            String childTreePath = treePath + "," + id;
+            this.update(new LambdaUpdateWrapper<Menu>()
+                    .eq(Menu::getParentId, id)
+                    .set(Menu::getTreePath, childTreePath)
+            );
+            for (Menu child : children) {
+                // 递归更新子菜单
+                updateChildrenTreePath(child.getId(), childTreePath);
+            }
+        }
+    }
+
     /**
      * 部门路径生成
      *