黑名单

app/controllers/admin/forumBlackList.js

@@ -16,7 +16,7 @@ router.post('/blacklist', function(req, res, next) {
 	var ent_code=req.session.user.ent_code;
 	ForumBlackListService.addBlack(req.body,ent_code,function(err,result){
 		if(err){
-			res.json(returnCode.BUSY);
+			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{
 			res.json(_.assign(result, returnCode.SUCCESS));
 		}
@@ -104,7 +104,8 @@ router.post('/blacklist/:id', function(req, res, next) {
 router.get('/userList', function(req, res, next) {
 	var obj={total:0};
 		obj.items=[];
-	ForumUserService.getUsers(req.query.pageNo,req.query.pageSize,
+	var ent_code=req.session.user.ent_code;
+	ForumUserService.getUsers(ent_code,req.query.pageNo,req.query.pageSize,
 	function(err,result){
 		if(err){
 			res.json(returnCode.BUSY);

app/service/forumBlackListService.js

@@ -49,7 +49,21 @@ exports.addBlack = function(blackList,entcode,callback){
 		return callback && callback('bad args');
 	}
 	blackList.ent_code = entcode;
-	async.waterfall([function(cb) {
+	async.waterfall([function(cb){
+		var condition = {ent_code:entcode};
+		if(blackList.blackOpenId){
+			condition.blackOpenId = blackList.blackOpenId;
+		}
+		if(blackList.uid){
+			condition.blackUser = blackList.uid;
+		}
+		BlackList.count(condition,function(err,count){
+			if(err || count){
+				return callback && callback('已经存在的记录');
+			}
+			cb();
+		});
+	},function(cb) {
 		var uid =blackList.uid;
 		delete blackList.uid;
 		if(!!!uid){

app/service/forumUserService.js

@@ -58,13 +58,13 @@ exports.updateUserById=function(uid,entity,callback){
 };
 
 
-exports.getUsers=function(pageNo,pageSize,callback){
+exports.getUsers=function(entcode,pageNo,pageSize,callback){
 	var pageNo = pageNo || 1;
 	var pageSize = pageSize || 10;
 	var getPageList = function(count){
 		var skip = (pageNo - 1) * pageSize;
         var limit = count - skip > pageSize ? pageSize : (count - skip);
-		ForumUser.find({}).limit(limit).skip(skip)
+		ForumUser.find({status:1,ent_code:entcode}).limit(limit).skip(skip)
 		.exec(function(err,results){
 			if(err){
 				callback(err,null);
@@ -77,7 +77,7 @@ exports.getUsers=function(pageNo,pageSize,callback){
 			}
 		});
 	};
-	ForumUser.count({}).exec(function(err,count){
+	ForumUser.count({status:1,ent_code:entcode}).exec(function(err,count){
 		if(err){
 			callback(err,null);
 		}else{

app/utils/returnCode.js

@@ -37,6 +37,12 @@ module.exports = {
 	CAN_NOT_RAISE_REPEAT: {
 		errorcode: 10006,
 		errormsg: '不能重复点赞'
+	},
+	UNCHECK_ERROR:function(msg){
+		return {
+			errorcode:9999,
+			errormsg:msg
+		};
 	}