Merge branch 'develop' into release-test

@@ -46,7 +46,8 @@ const getCgDirTreeData = async () => {
   const params = {
   const params = {
     execGuid: execGuidInfo.value?.execGuid
     execGuid: execGuidInfo.value?.execGuid
   }
   }
-  if (!execGuidInfo.value?.execGuid) {
+  if (!execGuidInfo.value?.execGuid || !execGuidInfo.value?.execGuid) {
+    treeInfo.value.loading = false;
     return;
     return;
   }
   }
   const res: any = await getTaskExeTreeList(params);
   const res: any = await getTaskExeTreeList(params);
@@ -1273,6 +1274,10 @@ const dataBaseTreeData = ref<any>();
 const getDataBaseTreeData = async () => {
 const getDataBaseTreeData = async () => {
   dataBaseTreeInfo.value.loading = true;
   dataBaseTreeInfo.value.loading = true;
   const res: any = await getDbDirTreeList({});
   const res: any = await getDbDirTreeList({});
+  if (res.data.length === 0 || !res.data) {
+    dataBaseTreeInfo.value.loading = false;
+    return;
+  }
   if (res.code == proxy.$passCode) {
   if (res.code == proxy.$passCode) {
     const dataArray = res.data;
     const dataArray = res.data;
     // 遍历并添加 GUIDs
     // 遍历并添加 GUIDs
@@ -1313,15 +1318,15 @@ const getDataBaseTreeData = async () => {
       dataBaseTreeInfo.value.loading = false;
       dataBaseTreeInfo.value.loading = false;
       return;
       return;
     }
     }
-    dataBaseTreeInfo.value.expandedKey.push(dataArray[0].guid);
-    dataBaseTreeInfo.value.currentNodeKey = dataArray[0].guid;
+    dataBaseTreeInfo.value.expandedKey.push(dataArray[0]?.guid);
+    dataBaseTreeInfo.value.currentNodeKey = dataArray[0]?.guid;
     dataBaseGuid.value = dataArray[0].databaseGuid;
     dataBaseGuid.value = dataArray[0].databaseGuid;
-    currentDatabasePath.value = [dataArray[0].name];
+    currentDatabasePath.value = [dataArray[0]?.name];
     selectedA.value = dataArray[0].databaseGuid;
     selectedA.value = dataArray[0].databaseGuid;
-    if (dataArray[0].dicType === 1) {
+    if (dataArray[0]?.dicType === 1) {
       isShowCreateBtn.value = true;
       isShowCreateBtn.value = true;
     }
     }
-    if (dataArray[0].dicType === 2) {
+    if (dataArray[0]?.dicType === 2) {
       isShowCreateBtn.value = false;
       isShowCreateBtn.value = false;
     }
     }
 
 

@@ -24,7 +24,10 @@ const getClassifyGradeTree = async () => {
   treeInfo.value.loading = true;
   treeInfo.value.loading = true;
   const res: any = await getClassifyGradeTreeList();
   const res: any = await getClassifyGradeTreeList();
   if (res.code == proxy.$passCode) {
   if (res.code == proxy.$passCode) {
-
+    if (!res.data || res.data.length === 0) {
+      treeInfo.value.loading = false;
+      return;
+    }
     const transformedData = transformData(res.data);
     const transformedData = transformData(res.data);
     classGradeTreeData.value = transformedData || [];
     classGradeTreeData.value = transformedData || [];
     treeInfo.value.data = classGradeTreeData.value;
     treeInfo.value.data = classGradeTreeData.value;
@@ -108,6 +111,10 @@ const LabelListData = ref<any>([]);
 const getLabelListData = async () => {
 const getLabelListData = async () => {
   const res: any = await getLabelList({ label: '' });
   const res: any = await getLabelList({ label: '' });
   if (res.code == proxy.$passCode) {
   if (res.code == proxy.$passCode) {
+    // 判空
+    if (!res.data || res.data.length === 0) {
+      return;
+    }
     LabelListData.value = res.data;
     LabelListData.value = res.data;
     const data = res.data
     const data = res.data
     if (data.length == 0) {
     if (data.length == 0) {

@@ -105,7 +105,7 @@ const tableInfo = ref({
       const { row } = scope;
       const { row } = scope;
       const approveVO = row.approveVO || {};
       const approveVO = row.approveVO || {};
       const currentStaffGuid = userData.staffGuid
       const currentStaffGuid = userData.staffGuid
-      const bizApproveState = row.bizApproveState;
+      const bizApproveState = row.approveState;
       const approveState = approveVO.approveState || null;
       const approveState = approveVO.approveState || null;
       const approveStaffGuids = approveVO.approveStaffGuids || [];
       const approveStaffGuids = approveVO.approveStaffGuids || [];
       const staffGuid = approveVO.staffGuid || '';
       const staffGuid = approveVO.staffGuid || '';