0321

app/admin/controller/Activity.php

@@ -99,13 +99,13 @@ class Activity extends BaseController
             $where[]=['c.platform_code',"=",$platform_code];
         }
         $count = Db::name('activity_info')->alias("a")
-            ->join("good_activity b","b.activity_code=b.activity_code","left")
+            ->join("good_activity b","b.activity_code=a.activity_code","left")
             ->join("platform c","c.platform_code=b.platform_code","left")
             ->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('activity_info')->alias("a")
-            ->join("good_activity b","b.activity_code=b.activity_code","left")
+            ->join("good_activity b","b.activity_code=a.activity_code","left")
             ->join("platform c","c.id=b.platform_code","left")
             ->where($where)->page($page,$size)->order("a.addtime desc")->field("a.*,b.activity_name,c.platform_name,c.platform_code
             ")->select();