| 
					
				 | 
			
			
				@@ -37,7 +37,7 @@ class Data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $source_type = $this->config(Dever::input('source_type', 'h5')); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             foreach ($data as $k => $v) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $child = $v['data']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $v['data'] = array(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $data[$k]['data'] = array(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $i = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 foreach ($child as $k1 => $v1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if ($v1['type'] == 2 && ($time < $v1['sdate'] || $time > $v1['edate'])) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -45,7 +45,7 @@ class Data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } elseif ($v1['system'] > 0 && $source_type != $v1['system']) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         //unset($data[$k]['data'][$k1]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        $v['data'][$i] = $v1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        $data[$k]['data'][$i] = $v1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         $i++; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 |