Merge branch 'bug_fix_1212_liu' into dev

app/Controller/UserController.php

@@ -37,6 +37,7 @@ class UserController extends AbstractController
                 'password' => 'required|min:6',//密码
                 'confirm_password' => 'required',
                 'real_name' => 'required',
+                'role_id' => 'required',
 //                'mobile' =>'required'
             ],
             [
@@ -49,6 +50,7 @@ class UserController extends AbstractController
                 'type_id.required' =>"用户类型不能为空",
                 'real_name.required' =>"姓名不能为空",
                 'password.min' =>"密码长度不能低于6位数",
+                'role_id.required' =>"所属角色不能为空",
             ]
         );
         if ($validator->fails()){
@@ -121,7 +123,8 @@ class UserController extends AbstractController
                 'type_id'=> 'required',//用户类型
                 'real_name' => 'required',
 //                'mobile' =>'required',
-                'id'=>'required'
+                'id'=>'required',
+                'role_id' => 'required',
             ],
             [
                 'user_name.required' => '用户名不能为空',
@@ -129,6 +132,7 @@ class UserController extends AbstractController
                 'type_id.required' =>"用户类型不能为空",
                 'real_name.required' =>"姓名不能为空",
                 'id.required' =>"id不能为空",
+                'role_id.required' =>"所属角色不能为空",
             ]
         );
         if ($validator->fails()){
@@ -328,11 +332,13 @@ class UserController extends AbstractController
                 'role_name' => 'required',
                 'rule' => 'required',
                 'remark' => 'required',
+                'sort'=>'integer'
             ],
             [
                 'role_name.required' => '角色名称不能为空',
                 'rule.required' => '权限不能为空',
                 'remark.required' => '职能描述不能为空',
+                'sort.integer' => '排序必须是整数',
             ]
         );
         if ($validator->fails()){