Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Activity.php

@@ -23,11 +23,11 @@ class Activity extends BaseController
             $where[]=['activity_name',"like","%$activity_name%"];
         }
         $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
-        if($status!=""){
+        if($status!==""){
             $where[]=['status',"=",$status];
         }
         $activity_code = isset($this->post['activity_code']) && $this->post['activity_code'] !=="" ? intval($this->post['activity_code']):"";
-        if($activity_code!=""){
+        if($activity_code!==""){
             $where[]=['activity_code',"like","%$activity_code%"];
         }
         $starttime = isset($this->post['starttime']) && $this->post['starttime']!=="" ? $this->post['starttime']:"";
@@ -39,11 +39,11 @@ class Activity extends BaseController
             $where[]=['end',"<",date('Y-m-d H:i:s',strtotime($endtime)+24*3600)];
         }
         $platform_code = isset($this->post['platform_code']) && $this->post['platform_code'] !=="" ? trim($this->post['platform_code']):"";
-        if($platform_code!=""){
+        if($platform_code!==""){
             $where[]=['platform_code',"=",$platform_code];
         }
         $company_id = isset($this->post['company_id']) && $this->post['company_id'] !=="" ? trim($this->post['company_id']):"";
-        if($company_id!=""){
+        if($company_id!==""){
             $where[]=['company_id',"=",$company_id];
         }
         $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater'])
@@ -53,7 +53,7 @@ class Activity extends BaseController
         }
         $createrid = isset($this->post['createrid']) && $this->post['createrid'] !=="" ? trim($this->post['createrid'])
             :"";
-        if($createrid!=""){
+        if($createrid!==""){
             $where[]=['createrid',"=",$createrid];
         }
 
@@ -75,7 +75,7 @@ class Activity extends BaseController
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : "10";
         $where = [["a.is_del", "=", 0]];
         $skuCode = isset($this->post['skuCode']) && $this->post['skuCode'] !== "" ? trim($this->post['skuCode']) : "";
-        if ($skuCode != "") {
+        if ($skuCode !== "") {
             $where[] = ['a.skuCode', "like", "%$skuCode%"];
         }
         $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name']) : "";
@@ -83,7 +83,7 @@ class Activity extends BaseController
             $where[] = ['a.good_name', "like", "%$good_name%"];
         }
         $activity_code = isset($this->post['activity_code']) && $this->post['activity_code'] !=="" ? intval($this->post['activity_code']):"";
-        if($activity_code!=""){
+        if($activity_code!==""){
             $where[]=['a.activity_code',"like","%$activity_code%"];
         }
         $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
@@ -96,7 +96,7 @@ class Activity extends BaseController
         }
         $platform_code = isset($this->post['platform_code']) && $this->post['platform_code'] !=="" ? trim($this->post['platform_code']):"";
         if($platform_code!=""){
-            $where[]=['c.platform_code',"=",$platform_code];
+            $where[]=['b.platform_code',"=",$platform_code];
         }
         $count = Db::name('activity_info')->alias("a")
             ->join("good_activity b","b.activity_code=a.activity_code","left")