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

backend/controllers/v1/shopuser/UserComplainController.php

@@ -5,6 +5,8 @@ namespace backend\controllers\v1\shopuser;
 use Yii;
 use backend\controllers\v1\BaseController;
 use app\models\v1\shopuser\UserComplain;
+use yii\web\BadRequestHttpException;
+
 class UserComplainController extends BaseController
 {
     public $modelClass='app\models\v1\shopuser\UserComplain';
@@ -26,11 +28,23 @@ class UserComplainController extends BaseController
 */
     public function actionUserComplain()
     {       
-        $get=Yii::$app->request->get();
-        $phone = isset($get['phone']) ? $get['phone'] : '';
         $model=new UserComplain();        
+        //用户输入数据赋值到模型属性
+        $model->TS_PHONE = Yii::$app->request->get('phone');
+        
+        if ($model->validate()) {
+            //所有输入数据都有效 all inputs are valid
+            $phone = $model->TS_PHONE;
             $info = $model->UserComplainInfo($phone);
+            if (!$info->getModels()) {
+                throw new BadRequestHttpException('未找到符合的留言信息');
+            }
             return $info;
+        } else {
+            //验证失败：$errors 是一个包含错误信息的数组
+            $errors = $model->errors;
+            return $errors;
+        }
     }
 
 }

backend/controllers/v1/shopuser/UserDepartmentController.php

@@ -5,6 +5,8 @@ namespace backend\controllers\v1\shopuser;
 use Yii;
 use backend\controllers\v1\BaseController;
 use app\models\v1\shopuser\UserDepartment;
+use yii\web\BadRequestHttpException;
+
 class UserDepartmentController extends BaseController
 {
     public $modelClass='app\models\v1\shopuser\UserDepartment';
@@ -27,11 +29,24 @@ class UserDepartmentController extends BaseController
  */
     public function actionDepartment()
     {               
-        $get=Yii::$app->request->get();
-        $code = isset($get['code']) ? $get['code'] : '';
-        $name = isset($get['name']) ? $get['name'] : '';
         $model=new UserDepartment();
+        //用户输入数据赋值到模型属性
+        $model->CODE = Yii::$app->request->get('code');
+        $model->NAME = Yii::$app->request->get('name');
+
+        if ($model->validate()) {
+            //所有输入数据都有效 all inputs are valid
+            $code = $model->CODE;
+            $name = $model->NAME;
             $info = $model->DepartmentInfo($code,$name);
+            if (!$info->getModels()) {
+                throw new BadRequestHttpException('未找到符合的部门信息');
+            }
             return $info;
+        } else {
+            //验证失败：$errors 是一个包含错误信息的数组
+            $errors = $model->errors;
+            return $errors;
+        }
     }   
 }

backend/models/v1/shopuser/UserComplain.php

@@ -42,7 +42,7 @@ class UserComplain extends BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required'],
+            [['GUID'], 'required','on'=>['create']],
             [['TS_CONTENT', 'TS_IDEA', 'TS_DESCRIPTION'], 'string'],
             [['TS_COMMIT_DATE', 'TS_REPLY_DATE', 'TS_REVISIT_DATE'], 'safe'],
             [['COMPLAIN_TYPE'], 'integer'],

backend/models/v1/shopuser/UserDepartment.php

@@ -33,7 +33,7 @@ class UserDepartment extends BaseModel
     public function rules()
     {
         return [
-            [['GUID'], 'required'],
+            [['GUID'], 'required','on'=>['create']],
             [['UPDATE_TIME'], 'safe'],
             [['GUID', 'ORG_GUID', 'CODE', 'NAME'], 'string', 'max' => 50],
             [['COMPANY', 'SUB_COMPANY'], 'string', 'max' => 255],