Merge branch 'dev' into dev0217

src/bg-ui/bg-nav-list.vue

@@ -82,7 +82,7 @@ const showMoreAction = (index) => {
 
 const getChildrenPath = (arr, temp = []) => {
   arr.forEach((e) => {
-    temp.push(e);
+    temp.push(e.path);
     if (e.children && e.children.length) {
       getChildrenPath(e.children, temp);
     }

src/page/main/system/organization/index.vue

@@ -792,6 +792,7 @@ const editAccount = (data) => {
       path: "/system/organization/org-user/edit",
       query: {
         id: data.id,
+        orgId: selectOrgNode.value.organization_id,
       },
     });
   } else {