Merge pull request 'update' (#103) from zhangwei into dev
Reviewed-on: #103
This commit is contained in:
commit
f8c8b3d618
app/adminapi/lists/custom
@ -42,6 +42,7 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'%like%' => ['name', 'position', 'phone', 'telephone', 'email'],
|
'%like%' => ['name', 'position', 'phone', 'telephone', 'email'],
|
||||||
|
'=' => ['custom_id']
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ class CustomFollowLists extends BaseAdminDataLists implements ListsSearchInterfa
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'%like%' => ['name', 'contacts', 'executor'],
|
'%like%' => ['name', 'contacts', 'executor'],
|
||||||
'=' => ['types']
|
'=' => ['custom_id','types']
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,8 +74,8 @@ class CustomLists extends BaseAdminDataLists implements ListsSearchInterface
|
|||||||
$item['follow_total'] = CustomFollow::where('custom_id', $item['id'])->count();
|
$item['follow_total'] = CustomFollow::where('custom_id', $item['id'])->count();
|
||||||
$item['add_user_name'] = $admin['name'];
|
$item['add_user_name'] = $admin['name'];
|
||||||
$item['province_name'] = $province['province_name'];
|
$item['province_name'] = $province['province_name'];
|
||||||
$item['city_name'] = $province['city_name'];
|
$item['city_name'] = $city['city_name'];
|
||||||
$item['area_name'] = $province['area_name'];
|
$item['area_name'] = $area['area_name'];
|
||||||
unset($item['province'],$item['add_user']);
|
unset($item['province'],$item['add_user']);
|
||||||
return $item;
|
return $item;
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user