|
@@ -24,6 +24,7 @@ class TableHeadService extends Service
|
|
|
'value' => $value['value'],
|
|
|
'sort' => $value['sort'],
|
|
|
'is_show' => $value['is_show'],
|
|
|
+ 'is_click_detail' => $value['is_click_detail'] ?? 0,
|
|
|
'menu_id' => $data['menu_id'],
|
|
|
'crt_time' => $time,
|
|
|
'crt_id' => $user['id'],
|
|
@@ -50,11 +51,20 @@ class TableHeadService extends Service
|
|
|
public function tableheadGet($data, $user){
|
|
|
if(empty($data['menu_id'])) return [false,'menu_id不能为空!'];
|
|
|
|
|
|
- $header = config("header.{$data['menu_id']}") ?? [];
|
|
|
+ $header = TableSetting::where('del_time',0)
|
|
|
+ ->where('menu_id',$data['menu_id'])
|
|
|
+ ->where('crt_id',$user['id'])
|
|
|
+ ->select('key','value','sort','is_show','is_click_detail','menu_id')
|
|
|
+ ->get()->toArray();
|
|
|
|
|
|
- foreach ($header as $key => $value){
|
|
|
- $header[$key]['sort'] = $key + 1;
|
|
|
- $header[$key]['is_show'] = 1;
|
|
|
+ if(empty($header)){
|
|
|
+ $header = config("header.{$data['menu_id']}") ?? [];
|
|
|
+
|
|
|
+ foreach ($header as $key => $value){
|
|
|
+ $header[$key]['sort'] = $key + 1;
|
|
|
+ $header[$key]['is_show'] = 1;
|
|
|
+ $header[$key]['is_click_detail'] = 0;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return [true, $header];
|