111

app/controllers/mobile/forumAboutMe.js

@@ -13,8 +13,8 @@ module.exports = function(app) {
 router.get('/aboutme/me2other', function(req, res, next) {
     var userId = user.getMobileUser(req);
     var entcode = req.session.user.ent_code;
-    var pageNo=req.params.pageNo;
-    var pageSize=req.params.pageSize;
+    var pageNo=req.query.pageNo || 1;
+    var pageSize=req.query.pageSize || 10;
     forumAboutMEService.me2other(entcode,userId,pageNo,pageSize,function(err,result){
         if(err){
             res.json(returnCode.UNCHECK_ERROR(err));
@@ -27,8 +27,36 @@ router.get('/aboutme/me2other', function(req, res, next) {
 router.get('/aboutme/other2me', function(req, res, next) {
     var userId = user.getMobileUser(req);
     var entcode = req.session.user.ent_code;
-    var pageNo=req.params.pageNo;
-    var pageSize=req.params.pageSize;
+    var pageNo=req.query.pageNo || 1;
+    var pageSize=req.query.pageSize || 10;
+    forumAboutMEService.other2me(entcode,userId,pageNo,pageSize,function(err,result){
+        if(err){
+            res.json(returnCode.UNCHECK_ERROR(err));
+        }else{
+            res.json(_.assign(result, returnCode.SUCCESS));
+        }
+    });
+});
+
+router.get('/aboutme/he2other/:id', function(req, res, next) {
+    var userId = req.params.id;
+    var entcode = req.session.user.ent_code;
+    var pageNo=req.query.pageNo || 1;
+    var pageSize=req.query.pageSize || 10;
+    forumAboutMEService.me2other(entcode,userId,pageNo,pageSize,function(err,result){
+        if(err){
+            res.json(returnCode.UNCHECK_ERROR(err));
+        }else{
+            res.json(_.assign(result, returnCode.SUCCESS));
+        }
+    });
+});
+
+router.get('/aboutme/other2he/:id', function(req, res, next) {
+    var userId = req.params.id;
+    var entcode = req.session.user.ent_code;
+    var pageNo=req.query.pageNo || 1;
+    var pageSize=req.query.pageSize || 10;
     forumAboutMEService.other2me(entcode,userId,pageNo,pageSize,function(err,result){
         if(err){
             res.json(returnCode.UNCHECK_ERROR(err));

app/controllers/mobile/forumInfo.js

@@ -415,6 +415,54 @@ router.get('/info/myThreads', function(req, res, next) {
         });
 });
 
+//获取他的文章列表
+router.get('/info/hisThreads/:id', 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,
+        from: req.params.id
+    };
+
+    async.waterfall([
+        function(callback) {
+            callback();
+            // forumUserThreadControlService.getUserThreadControlById(user.getMobileUser(req), function(err, doc) {
+            //     if (err) {
+            //         callback(err, null);
+            //     } else {
+            //         if (doc) {
+            //             callback(null, doc);
+            //         } else {
+            //             callback(null, null);
+            //         }
+            //     }
+            // });
+        }
+    ], function(err, result) {
+        if (err) {
+            console.error(err);
+            res.json(returnCode.BUSY);
+        } else {
+            if (result) {
+                conditions._id = {
+                    $nin: result.thread
+                };
+            }
+            //获取子话题数据
+            forumThreadService.getAllThreadByFid(conditions, pageNo, pageSize, '-created', function(err, results) {
+                if (err) {
+                    console.error(err);
+                    res.json(returnCode.BUSY);
+                } else {
+                    res.json(_.assign(results, returnCode.SUCCESS));
+                }
+            });
+        }
+    });
+});
+
 //获取我的评论列表
 router.get('/info/myComments', function(req, res, next) {
     var fid = req.params.fid || null;