Selaa lähdekoodia

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

wugg 3 vuotta sitten
vanhempi
commit
fb5b164b64
1 muutettua tiedostoa jossa 2 lisäystä ja 3 poistoa
  1. 2 3
      app/admin/controller/Activity.php

+ 2 - 3
app/admin/controller/Activity.php

@@ -191,7 +191,6 @@ class Activity extends BaseController
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $activity_code = makeNo("ACT");
-        $status= isset($this->post['status'])&&$this->post['status']!=="" ?$this->post['status']:"";
         Db::startTrans();
         try{
             $data=[
@@ -205,7 +204,7 @@ class Activity extends BaseController
                 "company_id"=>$company_id,
                 "creater"=>$creater,
                 "createrid"=>$createrid,
-                "status"=>$status,
+                "status"=>1,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
@@ -226,7 +225,7 @@ class Activity extends BaseController
                         $lemp['cost_price']=0;
                         $lemp['sale_price']=0;
                         $lemp['activity_price']=0;
-                        $lemp['status']=0;
+                        $lemp['status']=1;
                         $lemp['remark']="";
                         $lemp['is_del']=0;
                         $lemp['addtime']=date("Y-m-d H:i:s");