1

app/controllers/admin/forumThread.js

@@ -30,7 +30,7 @@ router.post('/thread/create', function(req, res, next) {
 	var rs = {};
 	req.body.ent_code=req.session.user.ent_code;
 
-	var uid='abcdefdfddfssfds';
+	var uid=req.session.user.id;
 
 	if(userUtil.getUserSession(req)){
 		req.body.from=userUtil.getUserSession._id;
@@ -68,8 +68,8 @@ router.post('/thread/create', function(req, res, next) {
 				}else{
 					var entity={
 						uid:uid,
-						nickName:'管理员',
-						icon:'http://fs.wxpai.cn/aofei/youyouqiu.png'
+						nickName:req.session.user.name,
+						icon:req.session.user.headPic
 					};
 					forumUserService.createUser(entity,function(err,doc){
 						if(err){

app/controllers/mobile/forumTag.js

@@ -35,6 +35,24 @@ router.get('/tag/list', function(req, res, next) {
 	});
 });
 
+//查询前台可使用的所有标签（针对发帖）
+router.get('/tag/mobileList', function(req, res, next) {
+	var pageNo = req.query.pageNo || 1;
+    var pageSize = req.query.pageSize || 10;
+    var conditions={
+    	ent_code:req.session.user.ent_code,
+    	type:1
+    };
+	forumTagService.getAllTag(conditions,pageNo,pageSize,function(err,results){
+		if(err){
+			console.error(err);
+			res.json(returnCode.BUSY);
+		}else{
+			res.json(_.assign(results, returnCode.SUCCESS));
+		}
+	});
+});
+
 //查询标签下的文章列表
 router.get('/tag/:tid/threads', function(req, res, next) {
 	var pageNo = req.query.pageNo || 1;

app/controllers/mobile/forumThread.js

@@ -27,34 +27,47 @@ module.exports = function(app) {
 
 //新增论坛文章
 router.post('/thread/create', function(req, res, next) {
-	var rs = {};
-	req.body.ent_code=req.session.user.ent_code;
-	req.body.from=user.getMobileUser(req);
-	// console.log(req.body);
+	var integral=req.session.openUser.integral||0;
+	var exp=req.session.openUser.exp||0;
 
-	//-----------处理前端上传图片开始
-	//格式为['http://imageurl','http://imageurl'],
-	//转换为[{urlFileName:'http://imageUrL'},{urlFileName:'http://imageUrL'}]
-	var images=req.body.images;
-	if(images){
-		var array=[];
-		for(var i=0;i<images.length;i=i+1){
-			array.push({
-				urlFileName:images[i]
-			});
-		}
-		req.body.images=array;
-	}
-	//-----------处理前端上传图片结束
-
-	forumThreadService.createThread(req.body,function(err,entity){
-		if (err) {
-			console.error(err);
+	forumRolePermissionService.checkRolePermiss(req.session.user.ent_code,'create',integral,exp,function(err,result){
+		if(err){
 			res.json(returnCode.BUSY);
-		} else {
-			rs.data = {'id':entity._id};
-			res.json(_.assign(rs, returnCode.SUCCESS));
-		}
+		}else{
+			if(result){//有操作权限
+				var rs = {};
+				req.body.ent_code=req.session.user.ent_code;
+				req.body.from=user.getMobileUser(req);
+				// console.log(req.body);
+
+				//-----------处理前端上传图片开始
+				//格式为['http://imageurl','http://imageurl'],
+				//转换为[{urlFileName:'http://imageUrL'},{urlFileName:'http://imageUrL'}]
+				var images=req.body.images;
+				if(images){
+					var array=[];
+					for(var i=0;i<images.length;i=i+1){
+						array.push({
+							urlFileName:images[i]
+						});
+					}
+					req.body.images=array;
+				}
+				//-----------处理前端上传图片结束
+
+				forumThreadService.createThread(req.body,function(err,entity){
+					if (err) {
+						console.error(err);
+						res.json(returnCode.BUSY);
+					} else {
+						rs.data = {'id':entity._id};
+						res.json(_.assign(rs, returnCode.SUCCESS));
+					}
+				});
+			}else{
+				res.json(returnCode.ACTION_NOT_PERMISSION);
+			}
+		}			
 	});
 });
 
@@ -233,11 +246,11 @@ router.post('/thread/:tid/raise', function(req, res, next) {
 											});
 										}
 									});
-								}else{
-									res.json(returnCode.ACTION_NOT_PERMISSION);
-								}
+							}else{
+								res.json(returnCode.ACTION_NOT_PERMISSION);
 							}
-						});
+						}
+					});
 				}
 			}
 		});

app/models/forumTag.js

@@ -13,6 +13,12 @@ var ForumTagSchema = new Schema({
 		type: String,
 		require: true,
 	},
+	type: { // 标签类型  1、前后台通用 2、后台使用
+		type: Number,
+		require: true,
+		index: true,
+		default: 1
+	},
 	icon: { //标签图片
 		type: String
 	},

app/models/forumThread.js

@@ -25,7 +25,7 @@ var ForumThreadSchema = new Schema({
 		type: String,
 		require: true
 	},
-	type:{//文章类型 1、文章 2、照片墙
+	type:{//文章类型 1、文章 2、照片墙 3、话题
 		type: Number,
 		require: true
 	},