Merge branch 'iteration-20240827-subject' into ponline

src/tenant/music/component/song/index.tsx

@@ -118,15 +118,18 @@ export default defineComponent({
                   )}
 
                   <div class={styles.tags}>
-                    {n.subjectNames
-                      ? n.subjectNames
-                          ?.split(',')
-                          .map((name: any) => <span>{name}</span>)
-                      : n.musicSubjectName &&
-                        n.musicSubjectName
-                          ?.split(',')
-                          .map((name: any) => <span>{name}</span>)}
-                    {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
+                    {n.musicSheetType === 'CONCERT' ? (
+                      <span>合奏</span>
+                    ) : n.subjectNames ? (
+                      n.subjectNames
+                        ?.split(',')
+                        .map((name: any) => <span>{name}</span>)
+                    ) : (
+                      n.musicSubjectName &&
+                      n.musicSubjectName
+                        ?.split(',')
+                        .map((name: any) => <span>{name}</span>)
+                    )}
                   </div>
 
                   <span class={[styles.name]}>

src/views/music/component/song/index.tsx

@@ -104,11 +104,14 @@ export default defineComponent({
                       : `作曲：${n.composer}`}
                   </span>
                   <div class={styles.tags}>
-                    {n?.subjectNames &&
+                    {n.musicSheetType === 'CONCERT' ? (
+                      <span>合奏</span>
+                    ) : (
+                      n?.subjectNames &&
                       n?.subjectNames
                         .split(',')
-                        .map((name: any) => <span>{name}</span>)}
-                    {n.musicSheetType === 'CONCERT' && <span>合奏</span>}
+                        .map((name: any) => <span>{name}</span>)
+                    )}
                   </div>
                 </div>
               </div>