diff --git a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets index 04232653e03f28ffe5f1e063dc3cc1692bb07368..ab9190b6af86222e909c6b2d63ff4c313e8bb7bb 100644 --- a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets @@ -120,13 +120,16 @@ export class FolderUtil { * @return string | Resource - folder text */ getFolderText(folderData: FolderData): string | Resource { - if (folderData && folderData.uuid) { - LogUtil.info(TAG, "folderData.uuid " + folderData.uuid + " folderData.folder_type " + folderData.folder_type) - return folderData.folder_type == FolderType.CusDef ? folderData.name : folderTextMap[folderData.uuid] - } else { - folderData.uuid = ''; + if (folderData === undefined || folderData === null) { LogUtil.info(TAG, "folderData undefined") + return '' + } + if (folderData.uuid === undefined || folderData.uuid === null) { + LogUtil.info(TAG, "folderData uuid undefined") + folderData.uuid = 'sys_def_unClassified_uuid'; } + LogUtil.info(TAG, "folderData.uuid " + folderData.uuid + " folderData.folder_type " + folderData.folder_type) + return folderData.folder_type == FolderType.CusDef ? folderData.name : folderTextMap[folderData.uuid] } /**