|
|
@@ -764,6 +764,7 @@ class EmployeeService extends Service
|
|
|
$model = new Role();
|
|
|
$model = $model->where('id',$data['id'])->first();
|
|
|
$model->title = $data['title'];
|
|
|
+ $model->tree_type = $user['select_tree_type'];
|
|
|
$model->save();
|
|
|
|
|
|
return [true,''];
|
|
|
@@ -776,6 +777,7 @@ class EmployeeService extends Service
|
|
|
$model = new Role();
|
|
|
$model->title = $data['title'] ;
|
|
|
$model->top_depart_id = $data['top_depart_id'];
|
|
|
+ $model->tree_type = $user['select_tree_type'];
|
|
|
$model->save();
|
|
|
|
|
|
return [true,''];
|
|
|
@@ -815,8 +817,10 @@ class EmployeeService extends Service
|
|
|
}
|
|
|
|
|
|
public function roleList($data,$user){
|
|
|
+ $select_tree_type = $user['select_tree_type'];
|
|
|
$model = Role::TopClear($user,$data);
|
|
|
$model = $model->where('del_time',0)
|
|
|
+ ->where('tree_type', $select_tree_type)
|
|
|
->select('title','crt_time','id','upd_time')
|
|
|
->orderBy('id','desc');
|
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%' . $data['title'] . '%');
|
