还原代码

app/Controller/FooterController.php

@@ -144,15 +144,29 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(isset($requireData['name']) && isset($requireData['website_id'])){
+        if(isset($requireData['name'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'name' =>'required' 
+                ],
+                [
+                    'name.required' => '底部导航名称不能为空'
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['name'] = $requireData['name'];
+        }
+        if(isset($requireData['website_id'])){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'name' =>'required',
                     'website_id' =>'required'
                 ],
                 [
-                    'name.required' => '底部导航名称不能为空',
                     'website_id.required' => '网站id不能为空'
                 ]
             );
@@ -160,8 +174,12 @@ class FooterController extends AbstractController
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);
             }
+             $data['website_id'] = $requireData['website_id'];
         }
-        $result = $this->footerServiceClient->upFooterCategory($requireData);
+       
+        $data['id'] = $requireData['id'];
+        // var_dump($data);
+        $result = $this->footerServiceClient->upFooterCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }else{
@@ -206,13 +224,13 @@ class FooterController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'type_id' =>'required',
+                'type' =>'required',
                 'fcat_id' =>'required',
                 'con_title' =>'required',
                 'content' =>'required'
             ],
             [
-                'type_id.required' => '底部导航类型不能为空',
+                'type.required' => '底部导航类型不能为空',
                 'fcat_id.required' => '底部导航id不能为空',
                 'con_title.required' => '内容标题不能为空',
                 'content.required' => '内容不能为空'
@@ -223,12 +241,11 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $data['type_id'] = $requireData['type_id'];
+        $data['type'] = $requireData['type'];
         $data['fcat_id'] = $requireData['fcat_id'];
         $data['con_title'] = $requireData['con_title'];
         $data['content'] = $requireData['content'];
-        // 内容型：0   列表型：1   列表标头型；2
-        if($data['type_id'] == 1){
+        if($data['type'] == 1){
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
@@ -238,12 +255,12 @@ class FooterController extends AbstractController
                     'list_title.required' => '列表标题不能为空'
                 ]
             );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['list_title'] = $requireData['list_title'];
         }
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data['list_title'] = $requireData['list_title'];
         // var_dump($data);
         $result = $this->footerServiceClient->addFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
@@ -276,28 +293,46 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->footerServiceClient->getFooterContent($requireData);
+        if(isset($requireData['con_title'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'con_title' =>'required'
+                ],
+                [
+                    'con_title.required' => '内容标题不能为空'
+                ]
+            );
+            if($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['con_title'] = $requireData['con_title'];
+        }
+        
+        $data['fcat_id'] = $requireData['fcat_id'];
+        $data['page'] = $requireData['page'];
+        $data['pageSize'] = $requireData['pageSize'];
+        $result = $this->footerServiceClient->getFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }else{
             return Result::success($result['data']);
         }
     }
-        /**
-        * 获取某个底部导航（列表）内容
-        * @return array
-        */
-        public function getOneFooterContent()
-        {
+    /*
+     * 获取底部导航（列表）内容
+     * @return array
+     */
+    public function getOneFooterContent(){
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' =>'required|integer'
+                'id' =>'required'
             ],
             [
-                'id.required' => '底部导航内容id不能为空',
-                'id.integer' => '底部导航内容id必须是整数'
+                'id.required' => '底部导航id不能为空'
             ]
         );
         if($validator->fails()){
@@ -305,11 +340,6 @@ class FooterController extends AbstractController
             return Result::error($errorMessage);
         }
         $data['id'] = $requireData['id'];
-        if($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        // var_dump($data);
         $result = $this->footerServiceClient->getOneFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -328,13 +358,13 @@ class FooterController extends AbstractController
             $requireData,
             [
                 'id' =>'required',
-                'type_id' =>'required',
+                'type' =>'required',
                 'con_title' =>'required',
                 'content' =>'required'
             ],
             [
                 'id.required' => '底部导航内容id不能为空',
-                'type_id.required' => '底部导航类型不能为空',
+                'type.required' => '底部导航类型不能为空',
                 'con_title.required' => '内容标题不能为空',
                 'content.required' => '内容不能为空'
             ]
@@ -343,8 +373,28 @@ class FooterController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $data['id'] = $requireData['id'];
+        $data['type'] = $requireData['type'];
+        $data['con_title'] = $requireData['con_title'];
+        $data['content'] = $requireData['content'];
+        if($data['type'] == 1){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'list_title' =>'required'
+                ],
+                [
+                    'list_title.required' => '列表标题不能为空'
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['list_title'] = $requireData['list_title'];
+        }
         // var_dump($data);
-        $result = $this->footerServiceClient->upFooterContent($requireData);
+        $result = $this->footerServiceClient->upFooterContent($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }else{
@@ -380,4 +430,5 @@ class FooterController extends AbstractController
             return Result::success($result['data']);
         }
     }
+    
 }