From f33da9ef0ee3489f9d4cb8cb9c04434797914f9f Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Tue, 16 Jul 2024 09:42:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=85=A8=E9=83=A8=E6=B2=A1=E5=80=BC=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/app/index.vue       | 46 +++++++++++--------
 .../DesignForm/tableListPage/index.vue        | 43 ++++++++++-------
 2 files changed, 55 insertions(+), 34 deletions(-)

diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index e63305bc1..826ec1910 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -354,7 +354,7 @@ const getPageData = () => {
 						let asfQueryParams = []
 						for(let j = 0;j< asfDetails.length;j++){
 							let asfQueryParamsItem :any = {}
-							console.log(asfDetails[j])
+							//console.log(asfDetails[j])
 							asfQueryParamsItem.formId = asfDetails[j].control.formid
 							asfQueryParamsItem.field = asfDetails[j].field
 							
@@ -369,26 +369,36 @@ const getPageData = () => {
 							asfQueryParamsItem.asfToSelectIds = asfToSelectIds
 							asfQueryParams.push(asfQueryParamsItem)
 						}
-						console.log(asfQueryParams)
-						getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
-							//console.log(data)
-							for(let i = 0;i<dataList.data.list.length; i++){
-								//console.log(dataList.data.list[i])
-								for(let j = 0;j<data.length;j++){
-									//console.log(data[j])
-									for(let n = 0;n<data[j].list.length;n++){
-										if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-											dataList.data.list[i][data[j].field] = data[j].list[n].label
+						let queryCount = 0
+						for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
+							if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
+								queryCount++
+							}
+						}
+						//console.log(asfQueryParams)
+						if(queryCount>0){
+							getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+								//console.log(data)
+								for(let i = 0;i<dataList.data.list.length; i++){
+									//console.log(dataList.data.list[i])
+									for(let j = 0;j<data.length;j++){
+										//console.log(data[j])
+										for(let n = 0;n<data[j].list.length;n++){
+											if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+												dataList.data.list[i][data[j].field] = data[j].list[n].label
+											}
+											//console.log(data[j].list[n])
 										}
-										//console.log(data[j].list[n])
+										
+										
 									}
-									
-									
 								}
-							}
-							tableDataList.value = dataList.data.list
-							
-						});
+								tableDataList.value = dataList.data.list
+								
+							});
+						}else{
+							tableDataList.value = data.data.list
+						}
 					}else{
 						tableDataList.value = data.data.list
 						
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index 933f1b518..d0ae9aa66 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -330,26 +330,37 @@ const getPageData = () => {
 					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
 					asfQueryParams.push(asfQueryParamsItem)
 				}
+				let queryCount = 0
+				for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
+					if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
+						queryCount++
+					}
+				}
 				//console.log(asfQueryParams)
-				getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
-					//console.log(data)
-					for(let i = 0;i<dataList.data.list.length; i++){
-						//console.log(dataList.data.list[i])
-						for(let j = 0;j<data.length;j++){
-							//console.log(data[j])
-							for(let n = 0;n<data[j].list.length;n++){
-								if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-									dataList.data.list[i][data[j].field] = data[j].list[n].label
+				if(queryCount>0){
+					getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
+						//console.log(data)
+						for(let i = 0;i<dataList.data.list.length; i++){
+							//console.log(dataList.data.list[i])
+							for(let j = 0;j<data.length;j++){
+								//console.log(data[j])
+								for(let n = 0;n<data[j].list.length;n++){
+									if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
+										dataList.data.list[i][data[j].field] = data[j].list[n].label
+									}
+									//console.log(data[j].list[n])
 								}
-								//console.log(data[j].list[n])
+								
+								
 							}
-							
-							
 						}
-					}
-					tableDataList.value = dataList.data.list
-					
-				});
+						tableDataList.value = dataList.data.list
+						
+					});
+				}else{
+					tableDataList.value = data.data.list
+				}
+				
 			}else{
 				tableDataList.value = data.data.list