diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index 90a24927..2b292abd 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -532,7 +532,7 @@ class Admin_DataController extends Zend_Controller_Action
 		
 		
 		$sql = "SELECT cm.*,md.title,(SELECT count(id) as counts FROM comments cms WHERE cms.reply=cm.id AND cms.reply!=0) as reply_count FROM comments cm
-				LEFT JOIN $submd md ON md.uuid=cm.uuid
+				right JOIN $submd md ON md.uuid=cm.uuid
 				WHERE cm.reply=0
 				ORDER BY cm.ts_created DESC,cm.id DESC";
 				
@@ -1186,8 +1186,8 @@ class Admin_DataController extends Zend_Controller_Action
 		
 		else
 		{
-	
-				$sql="select * from attachments order by id desc";
+			$submd=$this->view->config->sub->metadata;
+				$sql="select * from attachments where id in (select id from mdattach where uuid in (select uuid from $submd)) order by id desc";
 				$re= $this->db->query($sql);
 				$rows  = $re->fetchAll();
 				
@@ -1197,11 +1197,7 @@ class Admin_DataController extends Zend_Controller_Action
 				$paginator->setView($this->view);
 				Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination.phtml');
 				$this->view->paginator=$paginator;
-		}//所有附件
-		
-		
-		
-		
+		}//所有附件		
 	}//attachments 附件
 	
 	function uploadAction(){