|
|
@@ -29,7 +29,7 @@ class Business extends Auth{
|
|
|
* 列表页
|
|
|
*
|
|
|
* */
|
|
|
- public function index(Model $Model,City $City){
|
|
|
+ public function index(Model $Model,City $City,AdminUser $AdminUser){
|
|
|
// 接受参数
|
|
|
$code = request('business_code','');
|
|
|
$phone = request('phone','');
|
|
|
@@ -59,14 +59,15 @@ class Business extends Auth{
|
|
|
}
|
|
|
// 查询数据
|
|
|
$list = $Model->query()
|
|
|
- ->join('company','company.id','=','business.company_id')
|
|
|
- ->join('admin','admin.uid','=','business.admin_uid')
|
|
|
- ->where($map)
|
|
|
- ->orderByDesc('business.id')
|
|
|
- ->select('business.*','company.name as company_name', 'admin.username as username','admin.phone as admin_phone')
|
|
|
- ->paginate(config('page_num',10));
|
|
|
+ ->join('company','company.id','=','business.company_id')
|
|
|
+ ->where($map)
|
|
|
+ ->orderByDesc('business.id')
|
|
|
+ ->select('business.*','company.name as company_name')
|
|
|
+ ->paginate(config('page_num',10));
|
|
|
// 循环处理数据
|
|
|
foreach ($list as $key => $value) {
|
|
|
+ $value['username'] = $value['admin_uid'] ? (string) $AdminUser->getOne($value['admin_uid'],'username') : '';
|
|
|
+ $value['phone'] = $value['admin_uid'] ? (string) $AdminUser->getOne($value['admin_uid'],'phone') : '';
|
|
|
// id转编号
|
|
|
$value['business_code'] = $Model->idToCode($value['id']);
|
|
|
$value['logopic'] = $value['logopic'] ? path_compat($value['logopic']) : '';
|
