base64保存图片

biz/merchant/services/AdminService.php

@@ -34,8 +34,8 @@ class AdminService extends BaseService
 		xhTMessageService::sendUrlToMobile($url, $openId, $merchant);
 		return true;
 	}
-	
-	//根据管理员id取管理员 shish 2019.12.20
+
+	//根据id批量取管理员 shish 2019.12.20
 	public static function getAdminByIds($ids, $order = null, $indexBy = null)
 	{
 		$admin = AdminClass::getByIds($ids, $order, $indexBy);

biz/merchant/services/MerchantService.php

@@ -80,12 +80,13 @@ class MerchantService extends BaseService
 			return $data;
 		}
 		$adminIdList = array_column($list, 'adminId');
-		$admin = AdminService::getByIds($adminIdList,null,'id');
+		$admin = AdminService::getByIds($adminIdList, null, 'id');
 		$merchantIdList = array_column($list, 'merchantId');
 		$asset = MerchantAssetService::getByIds($merchantIdList, null, 'merchantId');
 		foreach ($list as $key => $val) {
 
 		}
+		$data['list'] = $list;
 		return $data;
 	}