| 
					
				 | 
			
			
				@@ -327,13 +327,17 @@ Class Appoint 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$data['info_log'] = Dever::db('work/info_log')->getAll(array('info_id'=>$info_id));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		foreach ($data['info_log'] as $k => $v) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $data['info_log'][$k]['admin_group'] = '';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$data['info_log'][$k]['cdate'] = date('Y-m-d H:i:s',$v['cdate']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$admin = Dever::db('manage/admin')->find($v['admin_id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $admin['group'] = explode(',',$admin['group']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            foreach ($admin['group'] as $k1 => $v1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $admin_group = Dever::db('manage/group')->find(array('company_id'=>$data['info']['company_id'],'id'=>$v1));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $data['info_log'][$k]['admin_group'] = $admin_group['name'].'   /   '.$admin['username'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (isset($admin['group']) && $admin['group']) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                foreach ($admin['group'] as $k1 => $v1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $admin_group = Dever::db('manage/group')->find(array('company_id'=>$data['info']['company_id'],'id'=>$v1));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $data['info_log'][$k]['admin_group'] = $admin_group['name'].'   /   '.$admin['username'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		$appoint = Dever::db('work/appoint')->find($v['appoint_id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     		if (isset($appoint) && $appoint) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     			$data['info_log'][$k]['desc'] = $appoint['desc'];
 
			 |