Merge remote-tracking branch 'origin/master'

app/Http/Controllers/Api/CustomFieldSettingController.php

@@ -35,6 +35,20 @@ class CustomFieldSettingController extends BaseController
 
     }
 
+    public function detail(Request $request)
+    {
+        $service = new CustomFieldSettingService();
+        $user = $request->userData;
+        list($status,$data) = $service->detail($request->all(),$user);
+
+        if($status){
+            return $this->json_return(200,'',$data);
+        }else{
+            return $this->json_return(201,$data);
+        }
+
+    }
+
     public function del(Request $request)
     {
         $service = new CustomFieldSettingService();

app/Service/CustomFieldSettingService.php

@@ -101,6 +101,14 @@ class CustomFieldSettingService extends Service
         return $data;
     }
 
+    public function detail($data, $user){
+        if(empty($data['id'])) return [false,'id不能为空'];
+        list($status, $return) = $this->list(['id' => [$data['id']]], $user);
+        $return = $return['data'][0] ?? [];
+
+        return [true, $return];
+    }
+
     public function fieldRule(&$data,$user, $is_add = true){
         if(empty($data['menu_id'])) return [false, '菜单不能为空'];
         $data['top_depart_id'] = $user['top_depart_id'];