Merge branch '0328_footcat_fr'

app/JsonRpc/FooterService.php

@@ -284,7 +284,7 @@ class FooterService implements FooterServiceInterface
             if(!isset($data['list_title']) || empty($data['list_title'])){
                 return Result::error("请输入底部导航列表标题！");
             }
-            $list_title = FooterContent::where('fcat_id', $content['fcat_id'])->where('id'!=$data['id'])->where('list_title',$data['list_title'])->first();
+            $list_title = FooterContent::where('id','!=',$data['id'])->where('fcat_id', $content['fcat_id'])->where('list_title',$data['list_title'])->first();
             if(!empty($list_title)){
                 return Result::error("该列表标题已存在！");
             }