Merge branch 'bugfix_0620_aboutme_list' into SANDBOX

app/models/forumAboutMe.js

@@ -32,8 +32,8 @@ var ForumAboutMeSchema = new Schema({
 		index: true,
 		ref: 'ForumThread',
 		require:true
-	},
-	threadStatus:{
+	}, 
+	threadStatus:{  //0屏蔽 1.正常， 2删除
 		type: Number
 	},
 	commentLevel1:{//一级评论
@@ -48,7 +48,7 @@ var ForumAboutMeSchema = new Schema({
 		index: true,
 		ref: 'ForumUser'
 	},
-	commentLevel1Status:{
+	commentLevel1Status:{ //0屏蔽 1.正常， 2删除
 		type: Number
 	},
 	commentLevel2:{//二级评论

app/service/forumAboutMEService.js

@@ -371,12 +371,20 @@ exports.me2other=function(ent_code,id,pageNo,pageSize,callback){
 	var condition={
 		ent_code:ent_code,
 		from:new mongoose.Types.ObjectId(id),
+		// $or:[{
+		// 	type:THREAD_TYPE,threadStatus:1
+		// },{
+		// 	type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
+		// },{
+		// 	type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
+		// }]
+
 		$or:[{
 			type:THREAD_TYPE,threadStatus:1
 		},{
-			type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
+			type:COMMENTLEVEL1_TYPE,threadStatus:1
 		},{
-			type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
+			type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1
 		}]
 	};
 
@@ -418,10 +426,16 @@ exports.other2me=function(ent_code,id,pageNo,pageSize,callback){
 	var condition={
 		ent_code:ent_code,
 		to:new mongoose.Types.ObjectId(id),
+		// $or:[{
+		// 	type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
+		// },{
+		// 	type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
+		// }]
+
 		$or:[{
-			type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
+			type:COMMENTLEVEL1_TYPE,threadStatus:1
 		},{
-			type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
+			type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1
 		}]
 	};
 	ForumAboutMe.find(condition).count(function(err,count){