Merge branch 'iteration-20240902-free' into jenkins-main

src/views/accompany/music-list.tsx

@@ -62,8 +62,16 @@ export default defineComponent({
     })
     const getTree = async () => {
       try {
-        const res: any = await request.get(
-          state.platformApi + '/musicSheetCategories/queryTree?enable=true&parentId=' + route.query.categorieid
+        // const res: any = await request.get(
+        //   state.platformApi + '/musicSheetCategories/queryTree?enable=true&parentId=' + route.query.categorieid
+        // )
+        const res: any = await request.post(
+          state.platformApi + '/musicSheetCategories/queryTreeByParentId', {
+            data: {
+              parentId: route.query.categorieid,
+              enable: true
+            }
+          }
         )
         if (Array.isArray(res?.data)) {
           data.musicTree = res.data
@@ -106,9 +114,10 @@ export default defineComponent({
       }
     }
     const option1 = computed(() => {
-      const v1: any = data.musicTree.find((n: any) => n.id == route.query.categorieid)
-      if (Array.isArray(v1?.musicSheetCategoriesList)) {
-        const list = v1.musicSheetCategoriesList.map((m: any) => {
+      const v1: any = data.musicTree
+    //.find((n: any) => n.id == route.query.categorieid)
+      if (Array.isArray(v1)) {
+        const list = v1.map((m: any) => {
           if (!data.value1) {
             data.value1 = m.id
             data.value2 = null
@@ -123,9 +132,12 @@ export default defineComponent({
       return []
     })
     const option2 = computed(() => {
-      const v1: any = data.musicTree.find((n: any) => n.id == route.query.categorieid)
-      if (Array.isArray(v1?.musicSheetCategoriesList)) {
-        const v2: any = v1.musicSheetCategoriesList.find((n: any) => n.id == data.value1)
+      const v1: any = data.musicTree
+      // .find((n: any) => n.id == route.query.categorieid)
+      console.log(v1, '---')
+      if (Array.isArray(v1)) {
+        const v2: any = v1?.find((n: any) => n.id == data.value1)
+
         if (Array.isArray(v2?.musicSheetCategoriesList)) {
           const list = [{ text: '全部', value: null }].concat(
             v2.musicSheetCategoriesList.map((m: any) => {