Merge branch '0328_footcat_fr'

app/Controller/FooterController.php

@@ -289,27 +289,12 @@ class FooterController extends AbstractController
                 'pageSize.required' => '每页显示数量不能为空'
             ]
         );
-        if($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        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);
-            }
+        if(isset($requireData['con_title']) && !empty($requireData['con_title'])){
             $data['con_title'] = $requireData['con_title'];
         }
-        
+        if(isset($requireData['list_title']) &&!empty($requireData['list_title'])){
+            $data['list_title'] = $requireData['list_title'];
+        }
         $data['fcat_id'] = $requireData['fcat_id'];
         $data['page'] = $requireData['page'];
         $data['pageSize'] = $requireData['pageSize'];

composer.lock

@@ -9248,11 +9248,11 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                },
                 "hyperf": {
                     "config": "Hyperf\\Watcher\\ConfigProvider"
+                },
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -12232,12 +12232,12 @@
     ],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": ">=8.1"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }