| 
					
				 | 
			
			
				@@ -76,6 +76,33 @@ class Journal_v1 extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public function getList_noCache($data)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if ($data['push']) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            foreach ($data['push'] as $k => $v) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $num_ding = Dever::load('act/lib/num')->getCounter($v['id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if ($num_ding && $num_ding >= $v['num_ding']) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $data['push'][$k]['num_ding'] = $num_ding;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $data['push'][$k] = $this->ding($data['push'][$k]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if ($data['journal']) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            foreach ($data['journal'] as $k => $v) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if ($v['hot'] == 1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $num_ding = Dever::load('act/lib/num')->getCounter($v['id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if ($num_ding && $num_ding >= $v['num_ding']) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        $data['journal'][$k]['num_ding'] = $num_ding;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        $data['journal'][$k] = $this->ding($data['journal'][$k]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return $data;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public function getList_noCache_old($data)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($data['push'] && $data['push']['hot'] == 1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $num_ding = Dever::load('act/lib/num')->getCounter($data['push']['id']);
 
			 |