问题修改

src/views/music-library/musicUtil.ts

@@ -2,25 +2,22 @@ import {getMapValueByKey} from "@/utils/objectUtil";
 import {clientType,} from "@/utils/constant";
 
 export const getOwnerName = (musicSheetExtend: any, sourceType: string) => {
-  let ownerName;
-  if (musicSheetExtend?.userName) {
-    ownerName = musicSheetExtend.userName
-  }
-  if (!ownerName) {
-    return null
+  if (musicSheetExtend == 'PLATFORM') {
+    return;
   }
+  let ownerName = '';
 
   if (musicSheetExtend && musicSheetExtend.userName) {
-    ownerName = musicSheetExtend.userName
     const appName = musicSheetExtend.applicationName;
-    let typeName = getMapValueByKey(musicSheetExtend.clientType, new Map(Object.entries(clientType)));
-    typeName = typeName ? '-' + typeName : '';
-    const organizationRole = musicSheetExtend.organizationRole ? '-' + musicSheetExtend.organizationRole : '';
     if (sourceType == 'ORG') {
-      ownerName += ' (' + appName + organizationRole + ')'
+      const organizationRole = musicSheetExtend.organizationRole ? '-' + musicSheetExtend.organizationRole : '';
+      ownerName += appName + organizationRole
     } else if (sourceType == 'PERSON') {
-      ownerName += ' (' + appName + typeName + ')'
-    } else if (sourceType == 'PLATFORM') {
+      if (musicSheetExtend?.userName) {
+        ownerName = musicSheetExtend.userName
+      }
+      let typeName = getMapValueByKey(musicSheetExtend.clientType, new Map(Object.entries(clientType)));
+      typeName = typeName ? '-' + typeName : '';
       ownerName += ' (' + appName + typeName + ')'
     }
   }

src/views/music-library/project-music-sheet/module/gym/music-sheet-gym.tsx

@@ -27,6 +27,8 @@ import {musicSheetApplicationExtendCategoryList, musicSheetApplicationOwnerList,
 import UpdateMusic from "@views/music-library/project-music-sheet/module/kt/updateMusic";
 import {subjectPage, sysApplicationPage} from "@views/system-manage/api";
 import {filterTimes} from "@/utils/dateUtil";
+import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-sheet-mec',
@@ -142,11 +144,20 @@ export default defineComponent({
     const getList = async () => {
       try {
         state.loading = true
+        const sourceType = state.searchForm.sourceType
+        let userId = state.searchForm.userId;
+        let organizationRoleId = null;
+        if (sourceType && sourceType === 'ORG') {
+          organizationRoleId = deepClone(userId)
+          userId = null
+        }
         const {data} = await musicSheetPageByApplication({
           ...state.pagination,
           ...state.searchForm,
+          userId: userId,
+          organizationRoleId: organizationRoleId,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
-          applicationId:state.applicationId
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -230,7 +241,7 @@ export default defineComponent({
                   <NDescriptionsItem label="曲目来源">
                     {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                   </NDescriptionsItem>
-                  <NDescriptionsItem label="所属人">{row.userName}</NDescriptionsItem>
+                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend,row.sourceType)}</NDescriptionsItem>
                 </NDescriptions>
               </>
           )
@@ -357,14 +368,14 @@ export default defineComponent({
                     onUpdateValue={async (value: any) => {
                       state.userIdData = []
                       state.searchForm.userId = null
-                      if (value) {
+                      if (value && value !== 'PLATFORM') {
                         const {data} = await musicSheetApplicationOwnerList({page: 1, rows: 9999, sourceType: value, applicationId: state.appId})
                         const temp = data.rows || []
                         temp.forEach((next: any) => {
                           state.userIdData.push({
                             ...next,
-                            label: next.userName,
-                            value: next.userId
+                            label: value === 'PERSON' ? next.userName : next.organizationRole,
+                            value: value === 'PERSON' ? next.userId : next.organizationRoleId
                           })
                         })
                         state.userIdDisable = false

src/views/music-library/project-music-sheet/module/gyt/music-sheet-gyt.tsx

@@ -27,6 +27,8 @@ import {musicSheetApplicationExtendCategoryList, musicSheetApplicationOwnerList,
 import UpdateMusic from "@views/music-library/project-music-sheet/module/kt/updateMusic";
 import {subjectPage, sysApplicationPage} from "@views/system-manage/api";
 import {filterTimes} from "@/utils/dateUtil";
+import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-sheet-gyt',
@@ -142,11 +144,20 @@ export default defineComponent({
     const getList = async () => {
       try {
         state.loading = true
+        const sourceType = state.searchForm.sourceType
+        let userId = state.searchForm.userId;
+        let organizationRoleId = null;
+        if (sourceType && sourceType === 'ORG') {
+          organizationRoleId = deepClone(userId)
+          userId = null
+        }
         const {data} = await musicSheetPageByApplication({
           ...state.pagination,
           ...state.searchForm,
+          userId: userId,
+          organizationRoleId: organizationRoleId,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
-          applicationId:state.applicationId
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -230,7 +241,7 @@ export default defineComponent({
                   <NDescriptionsItem label="曲目来源">
                     {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                   </NDescriptionsItem>
-                  <NDescriptionsItem label="所属人">{row.userName}</NDescriptionsItem>
+                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend,row.sourceType)}</NDescriptionsItem>
                 </NDescriptions>
               </>
           )
@@ -357,14 +368,14 @@ export default defineComponent({
                     onUpdateValue={async (value: any) => {
                       state.userIdData = []
                       state.searchForm.userId = null
-                      if (value) {
+                      if (value && value !== 'PLATFORM') {
                         const {data} = await musicSheetApplicationOwnerList({page: 1, rows: 9999, sourceType: value, applicationId: state.appId})
                         const temp = data.rows || []
                         temp.forEach((next: any) => {
                           state.userIdData.push({
                             ...next,
-                            label: next.userName,
-                            value: next.userId
+                            label: value === 'PERSON' ? next.userName : next.organizationRole,
+                            value: value === 'PERSON' ? next.userId : next.organizationRoleId
                           })
                         })
                         state.userIdDisable = false

src/views/music-library/project-music-sheet/module/klx/music-sheet-klx.tsx

@@ -10,6 +10,8 @@ import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStat
 import UpdateMusic from "@views/music-library/project-music-sheet/module/kt/updateMusic";
 import {subjectPage, sysApplicationPage} from "@views/system-manage/api";
 import {filterTimes} from "@/utils/dateUtil";
+import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'music-sheet-klx',
@@ -126,11 +128,20 @@ export default defineComponent({
     const getList = async () => {
       try {
         state.loading = true
+        const sourceType = state.searchForm.sourceType
+        let userId = state.searchForm.userId;
+        let organizationRoleId = null;
+        if (sourceType && sourceType === 'ORG') {
+          organizationRoleId = deepClone(userId)
+          userId = null
+        }
         const {data} = await musicSheetPageByApplication({
           ...state.pagination,
           ...state.searchForm,
+          userId: userId,
+          organizationRoleId: organizationRoleId,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
-          applicationId:state.applicationId
+          applicationId: state.applicationId
         })
         state.pagination.pageTotal = Number(data.total)
         state.dataList = data.rows || []
@@ -214,7 +225,7 @@ export default defineComponent({
                   <NDescriptionsItem label="曲目来源">
                     {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                   </NDescriptionsItem>
-                  <NDescriptionsItem label="所属人">{row.userName}</NDescriptionsItem>
+                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend,row.sourceType)}</NDescriptionsItem>
                 </NDescriptions>
               </>
           )
@@ -359,14 +370,14 @@ export default defineComponent({
                     onUpdateValue={async (value: any) => {
                       state.userIdData = []
                       state.searchForm.userId = null
-                      if (value) {
+                      if (value && value !== 'PLATFORM') {
                         const {data} = await musicSheetApplicationOwnerList({page: 1, rows: 9999, sourceType: value, applicationId: state.appId})
                         const temp = data.rows || []
                         temp.forEach((next: any) => {
                           state.userIdData.push({
                             ...next,
-                            label: next.userName,
-                            value: next.userId
+                            label: value === 'PERSON' ? next.userName : next.organizationRole,
+                            value: value === 'PERSON' ? next.userId : next.organizationRoleId
                           })
                         })
                         state.userIdDisable = false

src/views/music-library/project-music-sheet/module/kt/music-sheet-kt.tsx

@@ -22,12 +22,14 @@ import Pagination from "@components/pagination";
 import TheTooltip from "@components/TheTooltip";
 import AddMusic from "@views/music-library/project-music-sheet/module/kt/addMusic";
 import UpdateMusic from "@views/music-library/project-music-sheet/module/kt/updateMusic";
-import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStatus, musicSheetApplicationOwnerList, musicSheetPageByApplication, musicSheetStatusList} from "@views/music-library/api";
+import {musicSheetApplicationExtendCategoryList, musicSheetApplicationExtendStatus, musicSheetApplicationOwnerList, musicSheetPageByApplication} from "@views/music-library/api";
 import {getMapValueByKey, getSelectDataFromObj} from "@/utils/objectUtil";
 import {musicSheetAudioType, musicSheetSourceType, musicSheetType} from "@/utils/constant";
 import {sysApplicationPage} from "@views/menu-manage/api";
-import {musicSheetApplicationExtendSubjectList, subjectPage} from "@views/system-manage/api";
+import {musicSheetApplicationExtendSubjectList} from "@views/system-manage/api";
 import {filterTimes} from "@/utils/dateUtil";
+import deepClone from "@/utils/deep.clone";
+import {getOwnerName} from "@views/music-library/musicUtil";
 
 export default defineComponent({
   name: 'project-music-sheet-KT',
@@ -146,9 +148,18 @@ export default defineComponent({
     const getList = async () => {
       try {
         state.loading = true
+        const sourceType = state.searchForm.sourceType
+        let userId = state.searchForm.userId;
+        let organizationRoleId = null;
+        if (sourceType && sourceType === 'ORG') {
+          organizationRoleId = deepClone(userId)
+          userId = null
+        }
         const {data} = await musicSheetPageByApplication({
           ...state.pagination,
           ...state.searchForm,
+          userId: userId,
+          organizationRoleId: organizationRoleId,
           ...filterTimes(state.searchForm.times, ['startTime', 'endTime']),
           applicationId: state.applicationId
         })
@@ -234,7 +245,7 @@ export default defineComponent({
                   <NDescriptionsItem label="曲目来源">
                     {getMapValueByKey(row.sourceType, new Map(Object.entries(musicSheetSourceType)))}
                   </NDescriptionsItem>
-                  <NDescriptionsItem label="所属人">{row.userName}</NDescriptionsItem>
+                  <NDescriptionsItem label="所属人">{getOwnerName(row.musicSheetExtend,row.sourceType)}</NDescriptionsItem>
                 </NDescriptions>
               </>
           )
@@ -360,14 +371,14 @@ export default defineComponent({
                     onUpdateValue={async (value: any) => {
                       state.userIdData = []
                       state.searchForm.userId = null
-                      if (value) {
+                      if (value && value !== 'PLATFORM') {
                         const {data} = await musicSheetApplicationOwnerList({page: 1, rows: 9999, sourceType: value, applicationId: state.appId})
                         const temp = data.rows || []
                         temp.forEach((next: any) => {
                           state.userIdData.push({
                             ...next,
-                            label: next.userName,
-                            value: next.userId
+                            label: value === 'PERSON' ? next.userName : next.organizationRole,
+                            value: value === 'PERSON' ? next.userId : next.organizationRoleId
                           })
                         })
                         state.userIdDisable = false