test getNeedfulTemplate

modules/pm/controllers/pm_controller.js

@@ -650,25 +650,11 @@ module.exports = {
             await Promise.all(task);
             const rstData = shareData.filter(item => !item.isCancel);
             callback(req, res, 0, 'success', rstData);
-
-           /*  //添加分享
-            if(data.type === 'create'){
-                //新增
-                for (let sData of data.shareData) {
-                    await projectModel.update({ID: data.projectID, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]}, {$addToSet: {shareInfo: sData}});
-                }
-            } else if (data.type === 'update') {
-                await projectModel.update({ID: data.projectID, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]}, {$set: {shareInfo: data.shareData}});
-            } else { //取消分享
-                await projectModel.update({ID: data.projectID, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]}, {$pull: {shareInfo: {userID: {$in: shareUserIDs}}}});
-            }
-            callback(req, res, 0, 'success', data.shareData); */
         }
         catch (err){
             callback(req, res, 1, err, null);
         }
     },
-    // TODO bug: 单位工程分享、建设项目也分享的情况下，显示有问题
     receiveProjects: async function(req, res) {
         try {
             let rst = {grouped: [], ungrouped: [], summaryInfo: null};
@@ -678,8 +664,6 @@ module.exports = {
             const compilation = req.session.sessionCompilation._id;
             const notDeleted = [{deleteInfo: null}, {'deleteInfo.deleted': false}];
             const receiveProjects = await projectModel.find({ID: {$in: receiveProjectIDs}, compilation, $or: notDeleted}, '-_id').lean();
-            /* let receiveProjects = await projectModel.find({
-                $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}], compilation: req.session.sessionCompilation._id, 'shareInfo.userID': userID}, '-_id'); */
             //设置原项目用户信息
             const shareInfoMap = await pm_facade.getShareInfoMap(null, shareList);
             if(receiveProjects.length > 0){

modules/pm/facade/pm_facade.js

@@ -112,7 +112,6 @@ let labourCoeFacade = require('../../main/facade/labour_coe_facade');
 let calcProgramFacade = require('../../main/facade/calc_program_facade');
 let mainColLibModel = mongoose.model('std_main_col_lib');
 import EngineeringLibModel from "../../users/models/engineering_lib_model";
-import { mongo } from "mongoose";
 let installationFacade = require('../../main/facade/installation_facade');
 let cipher = require('../../../public/cipher');
 let qiniu = require("qiniu");
@@ -1241,7 +1240,6 @@ async function getPosterityProjects(projectIDs) {
 }
 
 //根据项目获得分享信息(分享层级不一定在项目级)(以最新为准)
-//@param {String}userId {Object}tender @return {Object} || {null}
 async function getShareInfo(userID, projectID) {
     // 接受到的分享项目
     const upChainIDs = await getUpChainIDs(projectID);

modules/templates/controllers/bills_template_controller.js

@@ -51,7 +51,8 @@ module.exports = {
             callback(req, res, 0, 'succes', mapping);
         } catch (err) {
             console.log(err);
-            callback(req, res, 1, err, null);
+            const msg = err.message || err;
+            callback(req, res, 1, msg, null);
         }
     }
 }