Merge branch 'forum_moderator_manage' of...

Merge branch 'forum_moderator_manage' of git.wxpai.cn:scrmgroup/pisns-forum-api into forum_moderator_manage

app/controllers/admin/forumLimitOperationLog.js

@@ -10,14 +10,18 @@ module.exports = function(app) {
     app.use('/admin/forum', router);
 };
 
-
 //根据userId获取论坛行为限制
 router.get('/limitOperationLogs/get/:userId', function(req, res, next) {
     var pageNo = req.query.pageNo || 1;
     var pageSize = req.query.pageSize || 10;
     var userId = req.params.userId;
-    if (userId) {
-        forumLimitOperationLogService.getAllLimitAction(userId, pageNo, pageSize, function(err, results) {
+    var ent_code = req.session.user.ent_code;
+    if (userId && ent_code) {
+        var conditions = {
+            ent_code:ent_code,
+            userId:userId
+        }
+        forumLimitOperationLogService.getAllLimitAction(conditions, pageNo, pageSize, function(err, results) {
             if (err) {
                 console.error(err);
                 res.json(returnCode.BUSY);

config/express.js

@@ -61,18 +61,18 @@ module.exports = function(app, config) {
     next();
   });
 	app.use(function(req, res, next) {
-      if(!req.session){
-        req.session ={}
-      }
+      // if(!req.session){
+      //   req.session ={}
+      // }
 
-        req.session.user = {
-         ent_code: 100001
-       };
-       req.session.openUser = {
-         openId: '1111',
-         integral: '100',
-         exp: '100'
-       };
+      //   req.session.user = {
+      //    ent_code: 100001
+      //  };
+      //  req.session.openUser = {
+      //    openId: '1111',
+      //    integral: '100',
+      //    exp: '100'
+      //  };
        
      if (!req.session.user && req.query.key && req.query.key === 'aiwanpai') {
        req.session.user = {