Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-manage into develop

app/Http/Controllers/Topic/TopicController.php

@@ -77,7 +77,7 @@ class TopicController extends Controller {
             'img' => 'required|url',
             'desc' => 'required|string|max:100',
             'category_ids' => 'required|string',
-            'base_count' => 'min:1|max:10000',
+            'base_count' => 'min:0|max:10000',
         ]);
         if ($validator->fails()) {
             return $this->response->error($validator->errors()->first(), 500);
@@ -92,7 +92,7 @@ class TopicController extends Controller {
             'img' => 'required|url',
             'desc' => 'required|string|max:100',
             'category_ids' => 'required|string',
-            'base_count' => 'min:1|max:10000',
+            'base_count' => 'min:0|max:10000',
         ]);
         if ($validator->fails()) {
             return $this->response->error($validator->errors()->first(), 500);

app/Repositories/TopicRepository.php

@@ -66,8 +66,10 @@ class TopicRepository {
             'name' => $request['name'],
             'img' => $request['img'],
             'desc' => $request['desc'],
-            'base_count' => $request['base_count'],
         ];
+        if(!empty($request['base_count'])){
+            $data['base_count'] = $request['base_count'];
+        }
         if(isset($request['category_ids'])){
             $category_ids = explode(',', $request['category_ids']);
         }
@@ -120,7 +122,9 @@ class TopicRepository {
         $topic->name = $request['name'];
         $topic->img = $request['img'];
         $topic->desc = $request['desc'];
-        $topic->base_count = $request['base_count'];
+        if(!empty($request['base_count'])){
+            $topic->base_count = $request['base_count'];
+        }
         $category_ids = [];
         if(!empty($request['category_ids'])){
             $category_ids = explode(',', $request['category_ids']);