Commit 0ebc45a7 authored by zw's avatar zw

Merge branch 'test'

parents a045da31 6c8d4994
...@@ -730,6 +730,7 @@ class Finance extends Basic ...@@ -730,6 +730,7 @@ class Finance extends Basic
$bargain_id_string = implode(',', $bargain_id); $bargain_id_string = implode(',', $bargain_id);
$where[] = ['EXP', 'b.id in ('.$bargain_id_string.') or b.father_id in ('.$bargain_id_string.')']; $where[] = ['EXP', 'b.id in ('.$bargain_id_string.') or b.father_id in ('.$bargain_id_string.')'];
} }
$select = 1;
} else { } else {
return $this->response(101, '内部错误:'.$bargain_arr['msg']); return $this->response(101, '内部错误:'.$bargain_arr['msg']);
} }
......
...@@ -742,7 +742,7 @@ class GHouses extends BaseModel ...@@ -742,7 +742,7 @@ class GHouses extends BaseModel
$save_data['create_time'] = date('Y-m-d H:i:s'); $save_data['create_time'] = date('Y-m-d H:i:s');
//C端随机图片 //C端随机图片
if (empty($data['is_show']) && !empty($save_data['industry_type'])) { if (!empty($save_data['industry_type'])) {
$industry_type = explode(',', $save_data['industry_type']); $industry_type = explode(',', $save_data['industry_type']);
$image = new ImageDepotService(); $image = new ImageDepotService();
$save_data['external_image_id'] = $image->getImage($industry_type[0]); $save_data['external_image_id'] = $image->getImage($industry_type[0]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment