Merge commit 'da5b2d3e' into SANDBOX

3d4abc87 · strong · e51d60b1 · da5b2d3e · 3d4abc87
Commit 3d4abc87 authored Dec 11, 2015 by strong
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 9 deletions

forumThread.js app/controllers/mobile/forumThread.js +16 -9

No files found.
--- a/app/controllers/mobile/forumThread.js
+++ b/app/controllers/mobile/forumThread.js
@@ -1744,15 +1744,22 @@ router.post('/thread/:tid/comment/:cid/slash', function(req, res, next) {
            if(!result){//不是该版主
                return res.json(returnCode.ACTION_NOT_PERMISSION);
            }
-            //屏蔽
+            //获得什么鬼。
-            forumCommentService.changeStatus(cid, 0, function(err, update) {
+            forumCommentService.getCommentById(cid, function(err, comment) {
-                if (err) {
+                if (comment && user_id) {
-                    res.json(returnCode.BUSY);
+                    //屏蔽
-                } else {
+                    forumCommentService.changeStatus(cid, 0, function(err, update) {
-                    if (comment && comment.level == 1) {
+                        if (err) {
-                        forumAboutMEService.updateCommentLevel1Status(comment._id, 0);
+                            res.json(returnCode.BUSY);
-                    }
+                        } else {
-                    res.json(returnCode.SUCCESS);
+                            if (comment && comment.level == 1) {
+                                forumAboutMEService.updateCommentLevel1Status(comment._id, 0);
+                            }
+                            res.json(returnCode.SUCCESS);
+                        }
+                    });
+                }else{
+                    res.json(returnCode.WRONG_PARAM);
                }
            });
        });