Merge branch 'ft-oem' into test

src/Common/Config/CfgCenter.php

@@ -31,7 +31,7 @@ class CfgCenter
 	 */
 	 */
 	public static function getByUser($keyName, \Hdll\Services\Common\Entity\User $user)
 	public static function getByUser($keyName, \Hdll\Services\Common\Entity\User $user)
 	{
 	{
-		if($user->getOemId() !== null) { // oemId有可能等于0
+		if( is_numeric($user->getOemId()) ) { // oemId有可能等于0
 			return self::getByOemId($keyName, $user->getOemId());
 			return self::getByOemId($keyName, $user->getOemId());
 		} else if($user->getStoreId()) {
 		} else if($user->getStoreId()) {
 			return self::getByStoreId($keyName, $user->getStoreId());
 			return self::getByStoreId($keyName, $user->getStoreId());