Merge pull request '修复 XEquipment 参数 getter 的 M8-M10 缺陷' (#83) from company-laptop/fix-xequipment-m8-m10 into main

Reviewed-on: #83
Reviewed-by: gjm <littleoldpan@163.com>

SourceCode/Code2026/CoreLibrary/Implement/XEquipmentImpl.h

@@ -54,8 +54,9 @@ public:\
 static const CString key;\
 ##type Get##key() const\
 {\
-	type v;\
-	m_pXDataMap->GetAt(key, v);\
+	type v = type();\
+	if (m_pXDataMap)\
+		m_pXDataMap->GetAt(key, v);\
 	return v;\
 }
 

SourceCode/Code2026/CoreLibrary/Implement/i_AecDbXEquipment.cpp

@@ -132,7 +132,8 @@ int AecDbXEquipment::GetType() const
 {
 	assertReadEnabled();
 	int nType = 0;
-	m_mapSpecXData.GetAt(KEY_TYPE, nType);
+	if (!m_mapSpecXData.GetAt(KEY_TYPE, nType))
+		acutPrintf(_T("\nAecDbXEquipment 缺少设备类型数据(KEY_TYPE)，按 0 处理。"));
 	return nType;
 }
 

SourceCode/Code2026/CoreLibrary/ParamEquImpl.h

@@ -43,8 +43,9 @@ public:\
 static const CString key;\
 ##type Get##key() const\
 {\
-	type v;\
-	m_pXDataMap->GetAt(key, v);\
+	type v = type();\
+	if (m_pXDataMap)\
+		m_pXDataMap->GetAt(key, v);\
 	return v;\
 }