Merge branch 'ft-oem' into test

src/Common/Config/CfgCenter.php

@@ -161,9 +161,17 @@ class CfgCenter
 	private static function _getConfigFromDb($keyName, $oemId)
 	{
 		$dbConn = self::dbConnect();
-		$result = $dbConn->select("config", ['name', 'value'], ['oemId' => $oemId, 'name' => $keyName]);
+		$result = $dbConn->select("config", ['value'], ['oemId' => $oemId, 'name' => $keyName]);
 		if (!isset($result[0]['value'])) {
-			return;
+			if($oemId > 0) {
+				// 如果指定的oemId查找不到，则使用活动啦啦(oemId==0)的配置
+				$result = $dbConn->select("config", ['value'], ['oemId' => 0, 'name' => $keyName]);
+				if (!isset($result[0]['value'])) {
+					return;
+				}
+			} else {
+				return;
+			}
 		}
 		$valArr = json_decode($result[0]['value'], true);
 		if (!is_array($valArr)) {