Browse Source

getData修改

vian 5 years ago
parent
commit
81150f7fa5

+ 2 - 1
modules/main/controllers/project_controller.js

@@ -42,13 +42,14 @@ module.exports = {
         // Project.getFilterData(data.project_id, ['bills', 'projectGLJ'], function (err, result) {
         // Project.getFilterData(data.project_id, ['bills', 'projectGLJ'], function (err, result) {
         //     console.log(result);
         //     console.log(result);
         // });
         // });
+        const isReport = false;
         Project.getData(data.project_id, function (err, message, result) {
         Project.getData(data.project_id, function (err, message, result) {
             if (!err) {
             if (!err) {
                 callback(req, res, err, message, result);
                 callback(req, res, err, message, result);
             } else {
             } else {
                 callback(req, res, err, message, null);
                 callback(req, res, err, message, null);
             }
             }
-        }, req.session.sessionUser.id);
+        }, isReport, req.session.sessionUser.id);
     },
     },
     getDataForInterface: async function (req, res) {
     getDataForInterface: async function (req, res) {
         const data = JSON.parse(req.body.data);
         const data = JSON.parse(req.body.data);

+ 2 - 2
modules/main/models/project.js

@@ -102,7 +102,7 @@ Project.prototype.save = function(datas, callback){
     me.datas = [];
     me.datas = [];
 };
 };
 
 
-Project.prototype.getData = function(projectID, callback, userID){
+Project.prototype.getData = function(projectID, callback, isReport, userID){
     var functions = [];
     var functions = [];
     var itemName;
     var itemName;
     let firstTime = +new Date();
     let firstTime = +new Date();
@@ -114,7 +114,7 @@ Project.prototype.getData = function(projectID, callback, userID){
                     let endTime = +new Date();
                     let endTime = +new Date();
                     console.log(moduleName+'---------------'+(endTime - startTime));
                     console.log(moduleName+'---------------'+(endTime - startTime));
                     cb(err, {moduleName: moduleName, data: data})
                     cb(err, {moduleName: moduleName, data: data})
-                }, userID)
+                }, isReport, userID)
             }
             }
         })(itemName))
         })(itemName))
     }
     }

+ 1 - 1
modules/pm/controllers/pm_controller.js

@@ -211,7 +211,7 @@ module.exports = {
         });
         });
     },
     },
     //project getData接口
     //project getData接口
-    getData: function (projectID, callback, userID) {
+    getData: function (projectID, callback, isReport, userID) {
         projectModel.findOne({ $or: [{ deleteInfo: null }, { 'deleteInfo.deleted': false }], ID: projectID }, '-_id').then(async function (project) {
         projectModel.findOne({ $or: [{ deleteInfo: null }, { 'deleteInfo.deleted': false }], ID: projectID }, '-_id').then(async function (project) {
             if (!project) {
             if (!project) {
                 callback('', consts.projectConst.PROJECT_INFO, {});
                 callback('', consts.projectConst.PROJECT_INFO, {});