|
@@ -89,17 +89,19 @@ class Index extends HomeBaseController
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
$list = Db::name('brand')
|
|
|
->alias('b')
|
|
|
- ->field('b.*,u.itemid')
|
|
|
- ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
|
|
|
->where($where)
|
|
|
- ->append(['company_name'])
|
|
|
- ->withAttr('company_name', function ($val, $data) {
|
|
|
- return implode('/', array_column(GetPart($data['itemid']), 'name'));
|
|
|
- })
|
|
|
->page($page, $size)
|
|
|
->order("addtime desc,id desc")
|
|
|
->select()
|
|
|
->toArray();
|
|
|
+
|
|
|
+ $all_createrid = array_column($list,'createrid');
|
|
|
+ $item = get_company_name_by_uid($all_createrid);
|
|
|
+
|
|
|
+ foreach ($list as &$value){
|
|
|
+ $value['company_name']=$item[$value['createrid']]??'';
|
|
|
+ }
|
|
|
+
|
|
|
return json_show(0, "获取成功", ['list' => $list, 'count' => $count]);
|
|
|
}
|
|
|
|
|
@@ -207,16 +209,18 @@ class Index extends HomeBaseController
|
|
|
->alias('b')
|
|
|
->where($where)
|
|
|
->page($page, $size)
|
|
|
- ->field("b.id,b.company,b.companyNo,b.status,b.creater,b.addtime,b.type,u.itemid")
|
|
|
- ->leftJoin("depart_user u", "u.uid=b.createrid AND u.is_del=0")
|
|
|
+ ->field("b.id,b.company,b.companyNo,b.status,b.creater,b.addtime,b.type")
|
|
|
->order("addtime desc")
|
|
|
- ->append(['company_name'])
|
|
|
- ->withAttr('company_name', function ($val, $data) {
|
|
|
- return implode('/', array_column(GetPart($data['itemid']), 'name'));
|
|
|
- })
|
|
|
->select()
|
|
|
->toArray();
|
|
|
|
|
|
+ $all_createrid = array_column($list, 'createrid');
|
|
|
+ $item = get_company_name_by_uid($all_createrid);
|
|
|
+
|
|
|
+ foreach ($list as &$value) {
|
|
|
+ $value['company_name'] = $item[$value['createrid']] ?? '';
|
|
|
+ }
|
|
|
+
|
|
|
return json_show(0, "获取成功", ['list' => $list, 'count' => $count]);
|
|
|
}
|
|
|
|