黑名单重复提交的检查

app/service/forumBlackListService.js

@@ -50,20 +50,34 @@ exports.addBlack = function(blackList,entcode,callback){
 		return callback && callback('bad args');
 	}
 	blackList.ent_code = entcode;
-	async.waterfall([function(cb){
+	async.waterfall([function(cb){//判断是否存在openid
 		var condition = {ent_code:entcode};
 		if(blackList.blackOpenId){
 			condition.blackOpenId = blackList.blackOpenId;
+			BlackList.count(condition,function(err,count){
+				if(count && count>0){
+					console.log(condition);
+					return callback && callback('已经存在的记录');
+				}
+				cb();
+			});
+		}else{
+			cb();
 		}
+	},function(cb){//判断是否存在uid
+		var condition = {ent_code:entcode};
 		if(blackList.uid){
 			condition.blackUser = blackList.uid;
-		}
-		BlackList.count(condition,function(err,count){
-			if(err || count){
-				return callback && callback('已经存在的记录');
-			}
+			BlackList.count(condition,function(err,count){
+				if(count && count>0){
+					console.log(condition);
+					return callback && callback('已经存在的记录');
+				}
+				cb();
+			});
+		}else{
 			cb();
-		});
+		}
 	},function(cb) {
 		var uid =blackList.uid;
 		delete blackList.uid;
@@ -85,7 +99,7 @@ exports.addBlack = function(blackList,entcode,callback){
 				console.error(err);
 				return callback && callback(err);
 			}
-			return callback && callback(null,black);
+			return callback && callback(null,{_id:black._id});
 		});
 	}],
 	function(err, result) {