pc

application/models/DAO/MessageHistory.php

@@ -38,7 +38,7 @@ class MessageHistoryModel extends \DAO\AbstractModel {
      *
      */
     public function getListByMemberIdAndToIdAndToType($memberId,$selfType,$toId,$toType,$field='*',$pageIndex=0,$pageSize=20){
-        $where=Common::format(" ((fromId={0} and toId={1} and toType={2} and fromType={3} and isDel not in(-1,2)) or (fromId={4} and toId={5}  and fromType={6} and toType={7} and isDel not in(-1,2)))",$memberId,$toId,$toType,$selfType,$toId,$memberId,$toType,$selfType);
+        $where=Common::format(" ((fromId={0} and toId={1} and toType={2} and fromType={3} and isDel not in(-1,2)) or (fromId={4} and toId={5}  and fromType={6} and toType={7} and isDel not in(-1,3)))",$memberId,$toId,$toType,$selfType,$toId,$memberId,$toType,$selfType);
         parent::setDb();
         $messages=$this->lists($where,array('gmtCreate'=>'desc'),$field,$pageIndex,$pageSize);
         return $messages;