修复岗位错误

app/Gdoo/Model/Controllers/StepController.php

@@ -199,7 +199,7 @@ class StepController extends DefaultController
             ['name' => '[创建人角色ID]', 'field' => '[start_role_id]', 'auto' => 1],
             ['name' => '[创建人部门ID]', 'field' => '[start_department_id]', 'auto' => 1],
             ['name' => '[创建人姓名]', 'field' => '[start_user]', 'auto' => 1],
-            ['name' => '[创建人职位]', 'field' => '[start_position]', 'auto' => 1],
+            ['name' => '[创建人职位]', 'field' => '[start_post]', 'auto' => 1],
             ['name' => '[创建人组]', 'field' => '[start_group]', 'auto' => 1],
             ['name' => '[创建人角色]', 'field' => '[start_role]', 'auto' => 1],
             ['name' => '[创建人部门]', 'field' => '[start_department]', 'auto' => 1],
@@ -207,7 +207,7 @@ class StepController extends DefaultController
             ['name' => '[经办人ID]', 'field' => '[edit_user_id]', 'auto' => 1],
             ['name' => '[经办人角色ID]', 'field' => '[edit_role_id]', 'auto' => 1],
             ['name' => '[经办人部门ID]', 'field' => '[edit_department_id]', 'auto' => 1],
-            ['name' => '[经办人职位]', 'field' => '[edit_position]', 'auto' => 1],
+            ['name' => '[经办人职位]', 'field' => '[edit_post]', 'auto' => 1],
             ['name' => '[经办人群组]', 'field' => '[edit_group]', 'auto' => 1],
             ['name' => '[经办人角色]', 'field' => '[edit_role]', 'auto' => 1],
             ['name' => '[经办人部门]', 'field' => '[edit_department]', 'auto' => 1],

app/Gdoo/Model/Services/FieldService.php

@@ -148,8 +148,8 @@ class FieldService
             'sys_user_name_date'       => '当前用户姓名+日期',
             'sys_user_name_datetime'   => '当前用户姓名+日期+时间',
             'sys_department_name'      => '当前用户部门',
-            'sys_user_position'        => '当前用户职位',
+            'sys_user_post'            => '当前用户职位',
-            'sys_user_position_assist' => '当前用户辅助职位',
+            'sys_user_post_assist'     => '当前用户辅助职位',
             'sys_sql'                  => '来自sql查询语句',
         ];
 
@@ -619,7 +619,7 @@ class FieldService
             'sys_user_name_datetime' => $user['name'].' '.date('Y-m-d H:i'),
             'sys_department_name' => $user->department['name'],
             '{UR}' => $user->role['name'],
-            '{UP}' => $user->position['name'],
+            '{UP}' => $user->post['name'],
         ];
 
         if ($field['is_read']) {

app/Gdoo/Model/Services/StepService.php

@@ -267,7 +267,7 @@ class StepService
         $form_data['[start_department_id]'] = $start_user['department_id'];
 
         $form_data['[start_user]'] = $start_user['user_name'];
-        $form_data['[start_position]'] = $start_user['position_name'];
+        $form_data['[start_post]'] = $start_user['post_name'];
         $form_data['[start_group]'] = $start_user['group_name'];
         $form_data['[start_role]'] = $start_user['role_name'];
         $form_data['[start_department]'] = $start_user['department_name'];
@@ -277,7 +277,7 @@ class StepService
         $form_data['[edit_department_id]'] = $current_user['department_id'];
 
         $form_data['[edit_user]'] = $current_user['user_name'];
-        $form_data['[edit_position]'] = $current_user['position_name'];
+        $form_data['[edit_post]'] = $current_user['post_name'];
         $form_data['[edit_group]'] = $current_user['group_name'];
         $form_data['[edit_role]'] = $current_user['role_name'];
         $form_data['[edit_department]'] = $current_user['department_name'];
@@ -519,7 +519,7 @@ class StepService
         ->LeftJoin('role', 'role.id', '=', 'user.role_id')
         ->LeftJoin('user_group', 'user_group.id', '=', 'user.group_id')
         ->LeftJoin('department', 'department.id', '=', 'user.department_id')
-        ->LeftJoin('user_position', 'user_position.id', '=', 'user.position_id')
+        ->LeftJoin('user_post', 'user_post.id', '=', 'user.post_id')
         
         ->where('user.id', $user_id)
         ->first([
@@ -527,8 +527,8 @@ class StepService
             'user.group_id',
             'user.department_id',
             'user.role_id',
-            'user.position_id',
+            'user.post_id',
-            'user_position.name as position_name',
+            'user_post.name as post_name',
             'user.name as user_name',
             'role.name as role_name',
             'department.name as department_name',

app/Gdoo/Model/views/step/create.blade.php

@@ -36,7 +36,7 @@
                     <option value="role" @if($row->type == 'role') selected @endif>指定角色</option>
                     <option value="created_id" @if($row->type == 'created_id') selected @endif>单据创建人ID</option>
                     <option value="field" @if($row->type == 'field') selected @endif>指定字段</option>
-                    <option value="position" @if($row->type == 'position') selected @endif>职位</option>
+                    <option value="post" @if($row->type == 'post') selected @endif>职位</option>
                     <option value="custom" @if($row->type == 'custom') selected @endif>自定义</option>
                 </select>
             </td>

app/Gdoo/User/Controllers/PostController.php

@@ -8,11 +8,11 @@ use Gdoo\Model\Grid;
 use Gdoo\Model\Form;
 
 use Gdoo\User\Models\User;
-use Gdoo\User\Models\UserPosition;
+use Gdoo\User\Models\UserPost;
 
 use Gdoo\Index\Controllers\DefaultController;
 
-class PositionController extends DefaultController
+class PostController extends DefaultController
 {
     public $permission = ['dialog'];
 
@@ -21,7 +21,7 @@ class PositionController extends DefaultController
         $header = Grid::header([
             'code' => 'user_post',
             'referer' => 1,
-            'search' => ['tab' => 'position'],
+            'search' => ['tab' => 'post'],
             'trash_btn' => 0,
         ]);
 
@@ -89,7 +89,7 @@ class PositionController extends DefaultController
         ]);
 
         if (Request::method() == 'POST') {
-            $model = UserPosition::orderBy('sort', 'asc');
+            $model = UserPost::orderBy('sort', 'asc');
             foreach ($search['where'] as $where) {
                 if ($where['active']) {
                     $model->search($where);

app/Gdoo/User/Controllers/ProfileController.php

@@ -13,7 +13,7 @@ use App\Support\Pinyin;
 use App\Support\License;
 
 use Gdoo\Hr\Models\Hr;
-use Gdoo\User\Models\UserPosition;
+use Gdoo\User\Models\UserPost;
 use Gdoo\User\Models\User;
 
 use Gdoo\Index\Controllers\DefaultController;

app/Gdoo/User/Models/User.php

@@ -26,7 +26,7 @@ class User extends BaseModel implements
             ['value' => 'role', 'type' => 'a', 'url' => 'user/role/index', 'name' => '角色'],
             ['value' => 'department', 'type' => 'a', 'url' => 'user/department/index', 'name' => '部门'],
             ['value' => 'group', 'type' => 'a', 'url' => 'user/group/index', 'name' => '用户组'],
-            ['value' => 'position', 'type' => 'a', 'url' => 'user/position/index', 'name' => '岗位'],
+            ['value' => 'post', 'type' => 'a', 'url' => 'user/post/index', 'name' => '岗位'],
         ]
     ];
 
@@ -80,9 +80,9 @@ class User extends BaseModel implements
         return $this->hasOne('Gdoo\Hr\Models\Hr');
     }
 
-    public function position()
+    public function post()
     {
-        return $this->belongsTo('Gdoo\User\Models\UserPosition', 'post');
+        return $this->belongsTo('Gdoo\User\Models\UserPost', 'post');
     }
 
     public function tasks()

app/Gdoo/User/Models/UserPost.php

@@ -2,14 +2,14 @@
 
 use Gdoo\Index\Models\BaseModel;
 
-class UserPosition extends BaseModel
+class UserPost extends BaseModel
 {
     protected $table = 'user_post';
 
     public static $tabs = [
         'name'  => 'tab',
         'items' => [
-            ['value' => 'position.index', 'url' => 'user/position/index', 'name' => '职位列表'],
+            ['value' => 'post.index', 'url' => 'user/post/index', 'name' => '职位列表'],
         ]
     ];
 

app/Gdoo/User/config.php

@@ -19,10 +19,10 @@ return [
             'model' => 'Gdoo\User\Models\Role::Dialog',
             'url' => 'user/role/dialog',
         ],
-        'position' => [
+        'post' => [
             'name' => '岗位',
-            'model' => 'Gdoo\User\Models\UserPosition::Dialog',
+            'model' => 'Gdoo\User\Models\UserPost::Dialog',
-            'url' => 'user/position/dialog',
+            'url' => 'user/post/dialog',
         ],
         'user' => [
             'name' => '用户',
@@ -126,7 +126,7 @@ return [
                 ]
             ]
         ],
-        "position" => [
+        "post" => [
             "name" => "用户职位",
             "actions" => [
                 "index" => [

app/Gdoo/User/views/post/create.blade.php

@@ -1,3 +1,3 @@
-<form class="form-horizontal form-controller" method="post" id="user_position" name="user_position">
+<form class="form-horizontal form-controller" method="post" id="user_post" name="user_post">
     {{$form['tpl']}}
 </form>