Merged branch remould_0627_forum_management into master

app/controllers/admin/forumInfo.js

@@ -5,7 +5,8 @@ var express = require('express'),
 	_ = require('lodash'),
 	moment = require('moment'),
 	nodeExcel = require('excel-export'),
-	then = require('thenjs');
+	then = require('thenjs'),
+    async = require('async');
 
 var mongoose = require('mongoose');
 var ForumInfo = mongoose.model('ForumInfo');
@@ -144,20 +145,58 @@ router.post('/info/:fid/update', function(req, res, next) {
 	}
 });
 
+//删除目标论坛板块
 //删除目标论坛板块
 router.post('/info/:fid/delete', function(req, res, next) {
-	var fid=req.params.fid;
-	if(fid){
-		forumInfoService.deleteInfoById(fid,function(err,result){
-			if(err){
-				res.json(returnCode.BUSY);
-			}else{
-				res.json(returnCode.SUCCESS);
-			}
-		});
-	}else{
-		res.json(returnCode.WRONG_PARAM);
-	}
+    var fid=req.params.fid;
+    var ent_code = req.session.user.ent_code;
+    if(fid){
+        async.waterfall([
+            function(callback) {
+                var today = new Date();
+                var conditions = {
+                    ent_code: ent_code,
+                    info: fid,
+                    level: 1,
+                    status: 1,
+                    $or: [{
+                        isEvent: {
+                            $ne:1
+                        }
+                    }, {
+                        isEvent: 1,
+                        'event.eventStartTime' : {$lte : today}
+                    }]
+                };
+                //统计板块有效的文章
+                forumThreadService.countThread(conditions, function(err, count) {
+                    if (err) {
+                        callback(err, null);
+                    } else {
+                        callback(null, count);
+                    }
+                });
+            }
+        ], function(err, count) {
+            if (err) {
+                res.json(returnCode.BUSY);
+            } else {
+                if(count > 0){
+                    res.json(returnCode.CAN_NOT_DELETE_INFO);
+                }else{
+                    forumInfoService.deleteInfoById(fid,function(err,result){
+                        if(err){
+                            res.json(returnCode.BUSY);
+                        }else{
+                            res.json(returnCode.SUCCESS);
+                        }
+                    });
+                }
+            }
+        });
+    }else{
+        res.json(returnCode.WRONG_PARAM);
+    }
 });
 
 /**

app/service/forumThreadService.js

@@ -1681,3 +1681,13 @@ exports.getThreadWithNotPopulateComment = function(conditions, pageNo, pageSize,
 
 };
 
+exports.countThread = function (conditions, callback) {
+    ForumThread.count(conditions, function(err, count) {
+        if (err) {
+            console.error(err);
+            callback(err, null);
+        } else {
+            callback(null, count);
+        }
+    });
+}
\ No newline at end of file

app/utils/returnCode.js

@@ -46,6 +46,10 @@ module.exports = {
 		errorcode: 10008,
 		errormsg: '内容超出限制'
 	},
+	CAN_NOT_DELETE_INFO: {
+		errorcode: 10009,
+		errormsg: '不能删除，请先转移版块下的帖子'
+	},
 	UNCHECK_ERROR:function(msg){
 		return {
 			errorcode:9999,