|
|
@@ -477,8 +477,17 @@ Class Appoint
|
|
|
$data['info'][$k]['cate_name'] = $cate['name'];
|
|
|
$you = Dever::db('work/priority')->find(array('id'=>$v['priority_id']));
|
|
|
$data['info'][$k]['you'] = $you['name'];
|
|
|
- $group = Dever::db('manage/group')->find(array('id'=>$v['branch_id']));
|
|
|
- $data['info'][$k]['branch'] = $group['name'];
|
|
|
+ $v['branch_id'] = explode(',',$v['branch_id']);
|
|
|
+ if (isset($v['branch_id'][0]) && $v['branch_id'][0]>0){
|
|
|
+ $group = Dever::db('manage/group')->find(array('id'=>$v['branch_id'][0],'company_id'=>$v['company_id']));
|
|
|
+ $data['info'][$k]['branch'] = $group['name'];
|
|
|
+ }
|
|
|
+ if (isset($v['branch_id'][1]) && $v['branch_id'][1]>0){
|
|
|
+ $admin = Dever::db('manage/admin')->find(array('id'=>$v['branch_id'][1]));
|
|
|
+ $data['info'][$k]['branch'] = $group['name'].'/'.$admin['username'];
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
$data['info'][$k]['status'] = Dever::status($config,$v['status']);
|
|
|
$data['info'][$k]['url'] = Dever::url('lib/appoint.show&id='.$v['id'],'work');
|
|
|
if ($v['status']<3) {
|
rabin