Merge branch 'remould_1209_delete_common' into SANDBOX

app/controllers/mobile/forumThread.js

@@ -1711,13 +1711,39 @@ router.post('/thread/:tid/comment/:cid/disable', function(req, res, next) {
 
 //更改评论状态为0(屏蔽)
 router.post('/thread/:tid/comment/:cid/slash', function(req, res, next) {
-    var user_id = user.getMobileUser(req),
-        tid = req.params.tid,
+    var tid = req.params.tid,
+        entCode = req.session.user.ent_code,
+        id = user.getMobileUser(req),//user._id 
         cid = req.params.cid;
-    if (tid && cid) {
-        forumCommentService.getCommentById(cid, function(err, comment) {
-            if (comment && user_id) {
-                if (comment.from.toString() == user_id.toString()) {
+    var q1={};//拼装查询条件
+    q1.ent_code = entCode;
+    q1._id=tid;
+    q1.status=1;
+    q1.$or=[{
+        recommend: 0
+    }, {
+        recommend: null
+    }];
+    ForumThread.findOne(q1).populate('from').exec(function(err, t) {
+        if (err || !t) {
+            return res.json(returnCode.BUSY);
+        }
+        if(!t.info){//没有板块id直接返回
+            return res.json(returnCode.BUSY);
+        }
+        var q2 = {};//查询当前用户是不是这篇文章的版主
+        q2.status=1;
+        q2.ent_code = entCode;
+        q2.forumUser=id;
+        q2.infoIds={$all:[t.info]};
+        ForumModeratorApply.findOne(q2).populate('forumUser').exec(function(err,result){
+            if(err){
+                return res.json(returnCode.BUSY);
+            }
+            if(!result){//不是该版主
+                return res.json(returnCode.ACTION_NOT_PERMISSION);
+            }
+            //屏蔽
             forumCommentService.changeStatus(cid, 0, function(err, update) {
                 if (err) {
                     res.json(returnCode.BUSY);
@@ -1725,22 +1751,11 @@ router.post('/thread/:tid/comment/:cid/slash', function(req, res, next) {
                     if (comment && comment.level == 1) {
                         forumAboutMEService.updateCommentLevel1Status(comment._id, 0);
                     }
-                            // if (comment && comment.level == 2) {
-                            //     forumAboutMEService.updateCommentLevel2Status(comment._id, 2);
-                            // }
                     res.json(returnCode.SUCCESS);
                 }
             });
-                } else {
-                    res.json(returnCode.ACTION_NOT_PERMISSION);
-                }
-            } else {
-                res.json(returnCode.WRONG_PARAM);
-            }
         });
-    } else {
-        res.json(returnCode.WRONG_PARAM);
-    }
+    });
 });
 
 //删除文章评论