1

app/Service/TableHeadService.php

@@ -57,18 +57,25 @@ class TableHeadService extends Service
             ->where('crt_id',$user['id'])
             ->select('key','value','sort','is_show','is_click_detail','menu_id','float')
             ->get()->toArray();
+        $header_map = array_column($header,null,'key');
 
-        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;
-                $header[$key]['float'] = 0;
+        $header_default = config("header.{$data['menu_id']}") ?? [];
+        foreach ($header_default as $key => $value){
+            if(isset($header_map[$value['key']])) {
+                //存在保存好的设置的表头 以下信息沿用
+                $tmp = $header_map[$value['key']];
+                $header_default[$key]['sort'] = $tmp['is_show'];
+                $header_default[$key]['is_show'] = $tmp['is_show'];
+                $header_default[$key]['is_click_detail'] = $tmp['is_click_detail'];
+                $header_default[$key]['float'] = $tmp['float'];
+            }else{
+                $header_default[$key]['sort'] = $key + 1;
+                $header_default[$key]['is_show'] = 1;
+                $header_default[$key]['is_click_detail'] = 0;
+                $header_default[$key]['float'] = 0;
             }
         }
 
-        return [true, $header];
+        return [true, $header_default];
     }
 }