|
@@ -129,6 +129,7 @@ Class Appoint
|
|
|
$default['name'] = '组员选择';
|
|
|
}
|
|
|
} else {
|
|
|
+ // echo 11;
|
|
|
$default = $this->default;
|
|
|
}
|
|
|
// if ($level_id < 0) {
|
|
@@ -148,6 +149,9 @@ Class Appoint
|
|
|
if ($level_search || $level_num >= 1) {
|
|
|
array_unshift($data, $default);
|
|
|
}
|
|
|
+ if ($level_num == 2) {
|
|
|
+ unset($data[0]);
|
|
|
+ }
|
|
|
$result['level_total'] = $level_total;
|
|
|
$result['list'] = $data;
|
|
|
return $result;
|
|
@@ -246,6 +250,17 @@ Class Appoint
|
|
|
$data['info']['source_name'] = $source['name'];
|
|
|
}
|
|
|
}
|
|
|
+ if ($data['info']['branch_id']) {
|
|
|
+ $branch_id = explode(',',$data['info']['branch_id']);
|
|
|
+ if (isset($branch_id[0]) && $branch_id[0]>0) {
|
|
|
+ $group = Dever::db('manage/group')->find($branch_id[0]);
|
|
|
+ $data['info']['branch_name'] = '指派人:'.$group['name'];
|
|
|
+ }
|
|
|
+ if (isset($branch_id[1]) && $branch_id[1]>0) {
|
|
|
+ $admin = Dever::db('manage/admin')->find($branch_id[0]);
|
|
|
+ $data['info']['branch_name'] = $data['info']['branch_name'].' / '.$admin['username'];
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$data['info']['role_name'] = '';
|
|
|
$user = Dever::db('work/user')->find(array('mobile'=>$data['info']['mobile']));
|