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

app/admin/controller/Cat.php

@@ -161,7 +161,7 @@ public function create()
     if ($cat_name == "") {
         return error_show(1002, "参数cat_name不能为空");
     }
-    $pid = isset($this->post['pid']) && $this->post['pid'] !== "" ? intval($this->post['pid']) : "";
+    $pid = isset($this->post['pid']) && $this->post['pid'] !== "" ? intval($this->post['pid']) : "0";
     if ($pid === "") {
         return error_show(1002, "参数pid不能为空");
     }
@@ -209,7 +209,7 @@ public function create()
 //    $sale_rate = isset($this->post['sale_rate ']) && $this->post['sale_rate '] !== "" ? intval($this->post['sale_rate ']) : "";
 //    $lower_rate = isset($this->post['lower_rate']) && $this->post['lower_rate'] !== "" ? intval($this->post['lower_rate']) : "";
     $weight = isset($this->post['weight']) && $this->post['weight'] !== "" ? intval($this->post['weight']) : "0";
-    $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "1";
+    $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "0";
     Db::startTrans();
     try{
         $data = [

app/admin/controller/Customar.php

@@ -248,7 +248,7 @@ class Customar extends BaseController
                     $item['status'] = $value['status'];
                     $item['createrid'] = $createrid;
                     $item['creater'] = $creater;
-                    $item['companyNo'] = isset($value['companyNo']) ? $value['companyNo'] : "";
+                    $item['companyNo'] = isset( $idinfo['companyNo']) ?  $idinfo['companyNo'] : "";
                     $item['is_del'] = 0;
                      $item['addtime']=date("Y-m-d H:i:s");
                     $item['updatetime'] = date("Y-m-d H:i:s");

app/admin/controller/Keepbrand.php

@@ -27,6 +27,10 @@ class Keepbrand extends BaseController
         if($brand_id==""){
             return error_show(1003,"参数brand_id不能为空");
         }
+        $rename = Db::name('brand_book')->where(['brand_id' => $brand_id,'is_del' => 0])->find();
+        if (!empty($rename)) {
+            return error_show(1002, "品牌名称已存在");
+        }
 //        $is_book = isset($this->post['is_book']) && $this->post['is_book'] !=="" ? trim($this->post['is_book']):"";
 //        if($is_book==""){
 //            return error_show(1003,"参数is_book不能为空");
@@ -43,7 +47,7 @@ class Keepbrand extends BaseController
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
         $long = isset($this->post['long']) && $this->post['long'] !=="" ? intval($this->post['long']):"0";
 
-        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"1";
+        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"0";
             $data=[
                 "brand_book"=>$brand_book,
                 "gyscode"=>$gyscode,
@@ -181,6 +185,10 @@ class Keepbrand extends BaseController
         if($brand_id==""){
             return error_show(1002,"参数brand_id不能为空");
         }
+        $rename = Db::name('brand_book')->where(['brand_id' => $brand_id, 'is_del' => 0])->find();
+        if (empty($rename)) {
+            return error_show(1002, "品牌名称已存在");
+        }
 //        $is_book = isset($this->post['is_book']) && $this->post['is_book'] !== "" ? intval($this->post['is_book']):"";
 //        if($is_book==""){
 //            return error_show(1002,"参数is_book不能为空");