Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/controllers/v1/transport/CompanyController.php

@@ -116,7 +116,7 @@ class CompanyController extends BaseController
         $model->scenario = 'create';//创建的场景
         $other_param = array(
             'GUID'=>Func::create_guid(),
-            'ORG_GUID'=>Yii::$app->user->identity->ORG_GUID,
+            'ORG_GUID'=>'100',//Yii::$app->user->identity->ORG_GUID,
         );
         $model->setAttributes($other_param);
         $model->setAttributes(Yii::$app->request->getBodyparams());
@@ -125,6 +125,8 @@ class CompanyController extends BaseController
             throw new HttpException(201,'添加成功');
         } elseif (!$model->hasErrors()) {
             throw new HttpException(500,'添加失败');
+        }else{
+            return $model;
         }
     }
 
@@ -167,11 +169,13 @@ class CompanyController extends BaseController
         $model->scenario = 'update';//创建的场景
         $model->setAttributes(Yii::$app->request->getBodyparams());
 
-        if ($model->save() === false && !$model->hasErrors()) {
-            throw new HttpException(500,'修改失败');
-        }
-
+        if ($model->save()) {
             throw new HttpException(200,'修改成功');
+        } elseif (!$model->hasErrors()) {
+            throw new HttpException(500,'添加失败');
+        }else{
+            return $model;
+        }
     }
 
      /**

backend/models/v1/transport/ShopTransportCompany.php

@@ -38,10 +38,11 @@ class ShopTransportCompany extends BaseModel
      */
     public function scenarios()
     {
-        return [
+        $scenarios =  [
             self::SCENARIO_CREATE => ['GUID', 'ORG_GUID', 'CODE', 'NAME', 'PHONE', 'DESCRIPTION', 'IS_DEFAULT'],
             self::SCENARIO_UPDATE => ['CODE', 'NAME', 'PHONE', 'DESCRIPTION', 'IS_DEFAULT'],
         ];
+        return array_merge (parent::scenarios(),$scenarios);
     }
 
     /**
@@ -50,8 +51,8 @@ class ShopTransportCompany extends BaseModel
     public function rules()
     {
         return [
-            [['GUID', 'ORG_GUID', 'CODE', 'IS_DEFAULT','NAME'], 'required','message'=>'{attribute}为必填项','on'=>self::SCENARIO_CREATE],
-            [['CODE', 'IS_DEFAULT','NAME'], 'required','message'=>'{attribute}为必填项','on'=>self::SCENARIO_UPDATE],
+            [['GUID', 'ORG_GUID', 'CODE', 'IS_DEFAULT','NAME'], 'required','on'=>[self::SCENARIO_CREATE]],
+            [['CODE', 'IS_DEFAULT','NAME'], 'required','on'=>[self::SCENARIO_UPDATE]],
             [['PHONE'], 'match','pattern' => '/^1\d{10}$/','message'=>'手机号格式不正确'],
             [['IS_DEFAULT'], 'boolean','message'=>'{attribute}传值错误'],
         ];