Skip to content

P
pisns-forum-api
Commit c02906a1 authored by strong's avatar strong
Browse files
Options

Merge commit '528f8843'

parents 5eaf6846 528f8843
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 10 deletions
app/models/forumAboutMe.js
View file @ c02906a1
...@@ -32,8 +32,8 @@ var ForumAboutMeSchema = new Schema({ ...@@ -32,8 +32,8 @@ var ForumAboutMeSchema = new Schema({
index: true, index: true,
ref: 'ForumThread', ref: 'ForumThread',
require:true require:true
}, },
threadStatus:{ threadStatus:{ //0屏蔽 1.正常， 2删除
type: Number type: Number
}, },
commentLevel1:{//一级评论 commentLevel1:{//一级评论
...@@ -48,7 +48,7 @@ var ForumAboutMeSchema = new Schema({ ...@@ -48,7 +48,7 @@ var ForumAboutMeSchema = new Schema({
index: true, index: true,
ref: 'ForumUser' ref: 'ForumUser'
}, },
commentLevel1Status:{ commentLevel1Status:{ //0屏蔽 1.正常， 2删除
type: Number type: Number
}, },
commentLevel2:{//二级评论 commentLevel2:{//二级评论
......
app/service/forumAboutMEService.js
View file @ c02906a1
...@@ -297,7 +297,6 @@ exports.saveCommentLevel2BySearch=function(tid,l1id,l2id){ ...@@ -297,7 +297,6 @@ exports.saveCommentLevel2BySearch=function(tid,l1id,l2id){
exports.updateThreadStatus=function(tid,status){ exports.updateThreadStatus=function(tid,status){
var condition={ var condition={
type:THREAD_TYPE,
thread:new mongoose.Types.ObjectId(tid), thread:new mongoose.Types.ObjectId(tid),
threadStatus:{$ne:status} threadStatus:{$ne:status}
} }
...@@ -321,7 +320,6 @@ exports.updateThreadStatus=function(tid,status){ ...@@ -321,7 +320,6 @@ exports.updateThreadStatus=function(tid,status){
exports.updateCommentLevel1Status=function(cid,status){ exports.updateCommentLevel1Status=function(cid,status){
var condition={ var condition={
type:COMMENTLEVEL1_TYPE,
commentLevel1:new mongoose.Types.ObjectId(cid), commentLevel1:new mongoose.Types.ObjectId(cid),
commentLevel1Status:{$ne:status} commentLevel1Status:{$ne:status}
} }
...@@ -345,7 +343,6 @@ exports.updateCommentLevel1Status=function(cid,status){ ...@@ -345,7 +343,6 @@ exports.updateCommentLevel1Status=function(cid,status){
exports.updateCommentLevel2Status=function(cid,status){ exports.updateCommentLevel2Status=function(cid,status){
var condition={ var condition={
type:COMMENTLEVEL2_TYPE,
commentLevel2:new mongoose.Types.ObjectId(cid), commentLevel2:new mongoose.Types.ObjectId(cid),
commentLevel2Status:{$ne:status} commentLevel2Status:{$ne:status}
} }
...@@ -371,12 +368,20 @@ exports.me2other=function(ent_code,id,pageNo,pageSize,callback){ ...@@ -371,12 +368,20 @@ exports.me2other=function(ent_code,id,pageNo,pageSize,callback){
var condition={ var condition={
ent_code:ent_code, ent_code:ent_code,
from:new mongoose.Types.ObjectId(id), 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:[{ $or:[{
type:THREAD_TYPE,threadStatus:1 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 +423,16 @@ exports.other2me=function(ent_code,id,pageNo,pageSize,callback){ ...@@ -418,10 +423,16 @@ exports.other2me=function(ent_code,id,pageNo,pageSize,callback){
var condition={ var condition={
ent_code:ent_code, ent_code:ent_code,
to:new mongoose.Types.ObjectId(id), to:new mongoose.Types.ObjectId(id),
// $or:[{
// type:COMMENTLEVEL1_TYPE,threadStatus:1,commentLevel1Status:1
// },{
// type:COMMENTLEVEL2_TYPE,threadStatus:1,commentLevel1Status:1,commentLevel2Status:1
// }]
$or:[{ $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){ ForumAboutMe.find(condition).count(function(err,count){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment