Merge remote-tracking branch 'origin/master'

app/Service/CustomFieldSettingService.php

@@ -110,12 +110,7 @@ class CustomFieldSettingService extends Service
     }
 
     public function fieldRule(&$data,$user, $is_add = true){
-        if(empty($data['menu_id'])) return [false, '菜单不能为空'];
         $data['top_depart_id'] = $user['top_depart_id'];
-
-        $title = SysMenu::where('id', $data['menu_id'])->value('title');
-        if(empty($title)) return [false, '菜单不存在或已被删除'];
-
 //        $bool = SysModules::where('del_time',0)
 //            ->where('top_depart_id', $data['top_depart_id'])
 //            ->where('menu_id', $data['menu_id'])
@@ -135,12 +130,13 @@ class CustomFieldSettingService extends Service
         }
 
         foreach ($data['data'] as $key => $value){
+            if(empty($value['menu_id'])) return [false, '菜单不能为空'];
             if(empty($value['field_label'])) return [false, '自定义项名称不能为空'];
             if(empty($value['field_type'])) return [false, '自定义项类型不能为空'];
             if(! isset(CustomFieldDefinitions::State_Type[$value['field_type']])) return [false, '自定义项类型错误'];
 
             $top_depart_id = $user['top_depart_id'];
-            $data['data'][$key]['menu_id'] = $data['menu_id'];
+            $data['data'][$key]['menu_id'] = $value['menu_id'];
             $data['data'][$key]['top_depart_id'] = $top_depart_id;
             $data['data'][$key]['upd_time'] = time();
 
@@ -150,14 +146,14 @@ class CustomFieldSettingService extends Service
                 $data['data'][$key]['field_key'] = $fieldKey;
                 $bool = CustomFieldDefinitions::where("field_label", $value['field_label'])
                     ->where('top_depart_id', $top_depart_id)
-                    ->where('menu_id', $data['menu_id'])
+                    ->where('menu_id', $value['menu_id'])
                     ->where('del_time',0)
                     ->exists();
             }else{
                 if($this->isEmpty($data,'id')) return [false,'id不能为空！'];
                 $bool = CustomFieldDefinitions::where("field_label", $value['field_label'])
                     ->where('top_depart_id', $top_depart_id)
-                    ->where('menu_id', $data['menu_id'])
+                    ->where('menu_id', $value['menu_id'])
                     ->where('id','<>',$data['id'])
                     ->where('del_time',0)
                     ->exists();