Merge branch 'development' of git.wxpai.cn:scrmgroup/pisns-forum-api into development

app/controllers/admin/forumBlackList.js

@@ -5,7 +5,6 @@ var express = require('express'),
 	_ = require('lodash');
 
 var ForumBlackListService=require('../../service/forumBlackListService');
-var ForumUserService=require('../../service/forumUserService');
 
 module.exports = function(app) {
 	app.use('/admin/forum', router);
@@ -16,7 +15,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 +103,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;
+	ForumBlackListService.getNotBlackUsers(ent_code,req.query.pageNo,req.query.pageSize,
 	function(err,result){
 		if(err){
 			res.json(returnCode.BUSY);

app/service/forumBlackListService.js

@@ -2,6 +2,7 @@
 var mongoose = require('mongoose');
 var BlackList = mongoose.model('BlackList');
 var ForumUserService = require("./forumUserService");
+var ForumUser = mongoose.model('ForumUser');
 var async=require('async');
 
 
@@ -49,7 +50,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){
@@ -162,4 +177,57 @@ exports.removeBlackById = function(id,callback){
 		} 
 		return callback && callback(null,result);
 	});
-}
\ No newline at end of file
+};
+
+exports.getNotBlackUsers=function(entcode,pageNo,pageSize,callback){
+	var pageNo = pageNo || 1;
+	var pageSize = pageSize || 10;
+	var getPageList = function(count,nins){
+		var skip = (pageNo - 1) * pageSize;
+        var limit = count - skip > pageSize ? pageSize : (count - skip);
+		ForumUser.find({ent_code:entcode,_id:{$nin:nins}}).limit(limit).skip(skip)
+		.exec(function(err,results){
+			if(err){
+				callback(err,null);
+			}else{
+				if(results){
+					callback(null,{total:count,items:results});
+				}else{
+					callback(null,{total:count,items:[]});
+				}
+			}
+		});
+	};
+	async.waterfall([function(cb){
+		//获取黑名单
+		BlackList.find({ent_code:entcode})
+		.select('blackUser').exec(function(err,results){
+			var nins=[];
+			if(results && results.length > 0){
+				for(var i=0,len=results.length;i<len;i++){
+					if(results[i].blackUser){
+						nins.push(results[i].blackUser);
+					}
+				}
+			}
+			cb(null,nins);
+		});
+	},
+	function(n, cb) {
+		console.log(n);
+		ForumUser.count({ent_code:entcode,_id:{$nin:n}}).exec(function(err,count){
+			if(err){
+				callback(err,null);
+			}else{
+				if(count > 0){
+					getPageList(count,n);
+				}else{
+					callback(null,{total:0,items:[]});
+				}
+			}
+		});
+	}],
+	function(err, result) {
+	     return callback && callback(err);
+	});	
+};
\ No newline at end of file

app/service/forumUserService.js

 'use strict';
 var mongoose = require('mongoose');
 var ForumUser = mongoose.model('ForumUser');
-
 //创建用户
 exports.createUser=function(entity,callback){
 	var forum = new ForumUser(entity);
@@ -56,36 +55,3 @@ exports.updateUserById=function(uid,entity,callback){
 		}
 	});
 };
-
-
-exports.getUsers=function(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)
-		.exec(function(err,results){
-			if(err){
-				callback(err,null);
-			}else{
-				if(results){
-					callback(null,{total:count,items:results});
-				}else{
-					callback(null,{total:count,items:[]});
-				}
-			}
-		});
-	};
-	ForumUser.count({}).exec(function(err,count){
-		if(err){
-			callback(err,null);
-		}else{
-			if(count > 0){
-				getPageList(count);
-			}else{
-				callback(null,{total:0,items:[]});
-			}
-		}
-	});
-};

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
+		};
 	}