hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复岗位错误

Browse Source
This commit is contained in:
hawind
2021-12-02 01:12:38 +08:00
parent 77b8563de3
commit b9833d0973
13 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Model/Services/FieldService.php
+3 -3
View File
@@ -148,8 +148,8 @@ class FieldService
'sys_user_name_date' => '当前用户姓名+日期',
'sys_user_name_datetime' => '当前用户姓名+日期+时间',
'sys_department_name' => '当前用户部门',
'sys_user_position' => '当前用户职位',
'sys_user_position_assist' => '当前用户辅助职位',
'sys_user_post' => '当前用户职位',
'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
+5 -5
View File
@@ -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_position.name as position_name',
'user.post_id',
'user_post.name as post_name',
'user.name as user_name',
'role.name as role_name',
'department.name as department_name',