userID统一使用建筑用户id而非ssoId

modules/all_models/fee_rates.js

@@ -49,7 +49,7 @@ mongoose.model('fee_rates', feeRatesSchema, 'fee_rates');
 let feeRateFileSchema = new Schema({
     ID: String,
     rootProjectID:Number,//顶层项目ID
-    userID:Number,
+    userID:String,
     name:String,
     libID: String,
     libName: String,

modules/all_models/projects.js

@@ -11,7 +11,7 @@ const ProjectSchema = new Schema({
     "ID": Number,
     "ParentID": Number,
     "NextSiblingID": Number,
-    "userID": Number,
+    "userID": String,
     "name": String,
     "projType": String,
     "recentDateTime": Date,

modules/all_models/unit_price_file.js

@@ -20,7 +20,7 @@ let modelSchema = {
     // 显示名称
     name: String,
     // 所属用户id
-    user_id: Number,
+    user_id: String,
     // 顶层projectId
     root_project_id: Number,
     deleteInfo: deleteSchema

modules/bills_lib/routes/maintain_bills_routes.js

@@ -13,7 +13,7 @@ module.exports = function (app) {
         else {
             res.render("maintain/bills_lib/html/main.html",
                 {userAccount: req.session.userAccount,
-                    userID: req.session.sessionUser.ssoId});
+                    userID: req.session.sessionUser.id});
         }
     });
     app.get("/stdBills", function(req, res){

modules/complementary_glj_lib/controllers/gljController.js

@@ -30,7 +30,7 @@ class GljController extends BaseController{
             gljLibId = engineeringInfo.glj_lib.length > 0 && typeof engineeringInfo.glj_lib !== 'undefined' ? engineeringInfo.glj_lib[0].id : null;
         }
         res.render('building_saas/complementary_glj_lib/html/tools-gongliaoji.html',{
-            userID: req.session.sessionUser.ssoId,
+            userID: req.session.sessionUser.id,
             gljLibId: gljLibId,
             compilationId: sessionCompilation._id
         });
@@ -96,7 +96,7 @@ class GljController extends BaseController{
         })
     }
     mixUpdateGljItems(req, res){
-        let user_id = req.session.sessionUser.ssoId,
+        let user_id = req.session.sessionUser.id,
             compilation_id = req.session.sessionCompilation._id;
         let data = JSON.parse(req.body.data);
         let updateItems = data.updateItems,

modules/complementary_ration_lib/controllers/compleRationController.js

@@ -14,14 +14,14 @@ let callback = function (req, res, err, msg, data) {
 class CompleRationController extends BaseController{
     getRationItems(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.getRationItems(req.session.sessionUser.ssoId, data.rationRepId, data.sectionId, function (err, data) {
+        compleRationDao.getRationItems(req.session.sessionUser.id, data.rationRepId, data.sectionId, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
 
     updateRations(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.updateRation(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, data.updateData, function (err, data) {
+        compleRationDao.updateRation(req.session.sessionUser.id, req.session.sessionCompilation._id, data.updateData, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
@@ -29,14 +29,14 @@ class CompleRationController extends BaseController{
     //更新补充定额价格
     updateRationBasePrc(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.updateRationBasePrc(req.session.sessionUser.ssoId, data.basePrcArr, function (err, data) {
+        compleRationDao.updateRationBasePrc(req.session.sessionUser.id, data.basePrcArr, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
 
     mixUpdateRationItems(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.mixUpdateRationItems(req.session.sessionUser.ssoId, req.session.sessionCompilation._id,
+        compleRationDao.mixUpdateRationItems(req.session.sessionUser.id, req.session.sessionCompilation._id,
             data.rationRepId, data.sectionId, data.updateItems, data.addItems, data.removeIds, function (err, data) {
             callback(req, res, err, '', data);
         });
@@ -45,7 +45,7 @@ class CompleRationController extends BaseController{
     //获取所有定额的编号
     getRationsCodes(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.getRationsCodes(req.session.sessionUser.ssoId, data.rationRepId, function (err, data) {
+        compleRationDao.getRationsCodes(req.session.sessionUser.id, data.rationRepId, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
@@ -66,21 +66,21 @@ class CompleRationController extends BaseController{
 
     getGljItemsByIds(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.getGljItemsByIds(req.session.sessionUser.ssoId, data.ids, function (err, data) {
+        compleRationDao.getGljItemsByIds(req.session.sessionUser.id, data.ids, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
 
     getGljItemsByCodes(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.getGljItemsByCodes(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, data.rationRepId, data.gljCodes, function (err, data) {
+        compleRationDao.getGljItemsByCodes(req.session.sessionUser.id, req.session.sessionCompilation._id, data.rationRepId, data.gljCodes, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
 
     getRationGljItemsBySection(req, res){
         let data = JSON.parse(req.body.data);
-        compleRationDao.getRationGljItemsBySection(req.session.sessionUser.ssoId, data.sectionId, function (err, data) {
+        compleRationDao.getRationGljItemsBySection(req.session.sessionUser.id, data.sectionId, function (err, data) {
             callback(req, res, err, '', data);
         });
     }

modules/complementary_ration_lib/controllers/compleSectionTreeController.js

@@ -20,14 +20,14 @@ class CompleSectionTreeController extends BaseController{
 
     getRationTree(req, res){
         let data = JSON.parse(req.body.data);
-        sectionTreeDao.getRationTree(req.session.sessionUser.ssoId, data.rationRepId, function (err, data) {
+        sectionTreeDao.getRationTree(req.session.sessionUser.id, data.rationRepId, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
 
     updateRationSection(req, res){
         let data = JSON.parse(req.body.data);
-        sectionTreeDao.updateSection(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, data.updateData, function (err, data) {
+        sectionTreeDao.updateSection(req.session.sessionUser.id, req.session.sessionCompilation._id, data.updateData, function (err, data) {
             callback(req, res, err, '', data);
         });
     }

modules/complementary_ration_lib/controllers/compleViewController.js

@@ -13,32 +13,32 @@ let callback = function (req, res, err, msg, data) {
 class CompleViewController extends BaseController{
     redirectMain(req, res){
         res.render('building_saas/complementary_ration_lib/html/main.html', {
-            userID: req.session.sessionUser.ssoId,
+            userID: req.session.sessionUser.id,
             compilationId: req.session.sessionCompilation._id
         });
     }
 
     redirectRation(req, res){
         res.render('building_saas/complementary_ration_lib/html/dinge.html', {
-            userID: req.session.sessionUser.ssoId
+            userID: req.session.sessionUser.id
         });
     }
 
     redirectGljList(req, res){
         res.render('building_saas/complementary_ration_lib/html/gongliao.html', {
-            userID: req.session.sessionUser.ssoId
+            userID: req.session.sessionUser.id
         });
     }
 
     redirectCoeList(req, res){
         res.render('building_saas/complementary_ration_lib/html/fuzhu.html', {
-            userID: req.session.sessionUser.ssoId
+            userID: req.session.sessionUser.id
         });
     }
 
     redirectInstallation(req, res){
         res.render('building_saas/complementary_ration_lib/html/anzhuang.html', {
-            userID: req.session.sessionUser.ssoId
+            userID: req.session.sessionUser.id
         });
     }
 

modules/complementary_ration_lib/controllers/searchController.js

@@ -13,14 +13,14 @@ let callback = function (req, res, err, message, data) {
 class SearchController extends BaseController{
     getRationItem(req, res){
         let data = JSON.parse(req.body.data);
-        searchDao.getRationItem(req.session.sessionUser.ssoId, data.rationRepId, data.code, function (err, data) {
+        searchDao.getRationItem(req.session.sessionUser.id, data.rationRepId, data.code, function (err, data) {
             callback(req, res, err, '', data);
         });
     }
 
     findRation(req, res){
         let data = JSON.parse(req.body.data);
-        searchDao.findRation(req.session.sessionUser.ssoId, data.rationRepId, data.keyword, function (err, data) {
+        searchDao.findRation(req.session.sessionUser.id, data.rationRepId, data.keyword, function (err, data) {
             callback(req, res, err, '', data);
         });
     }

modules/glj/controllers/glj_controller.js

@@ -246,7 +246,7 @@ class GLJController extends BaseController {
         try {
             let sessionUserData = request.session.sessionUser;
             // 获取对应用户所有的建设项目数据
-            let projectList = await ProjectModel.getUserProjectData(sessionUserData.ssoId);
+            let projectList = await ProjectModel.getUserProjectData(sessionUserData.id);
             if (projectList === null) {
                 throw '没有找到对应的项目数据';
             }
@@ -312,7 +312,7 @@ class GLJController extends BaseController {
 
                 insertData = JSON.parse(JSON.stringify(currentUnitPrice));
                 insertData.root_project_id = rootProjectId;
-                insertData.user_id = insertData.user_id === undefined ? request.session.sessionUser.ssoId : insertData.user_id;
+                insertData.user_id = insertData.user_id === undefined ? request.session.sessionUser.id : insertData.user_id;
                 delete insertData._id;
                 delete insertData.ID;
             }
@@ -375,7 +375,7 @@ class GLJController extends BaseController {
             let insertData = {
                 name: name,
                 project_id: projectId,
-                user_id: request.session.sessionUser.ssoId,
+                user_id: request.session.sessionUser.id,
                 root_project_id: rootProjectId
             };
             let addResult = await unitPriceFileModel.add(insertData);

modules/main/controllers/bills_controller.js

@@ -243,7 +243,7 @@ module.exports = {
                 //将excel数据转换成清单树结构数据
                 let insertDatas = parseToBillData(getValidImportData(sheet[0].data), getColMapping(sheet[0].data), fixedBill, projectID, {stdBills: stdBills, stdJobs: stdJobs, stdCharacters: stdCharacters});
                 //删除相关数据
-                let deleteDatas = await billsData.deepDeleteBill([fixedBill], req.session.sessionUser.ssoId);
+                let deleteDatas = await billsData.deepDeleteBill([fixedBill], req.session.sessionUser.id);
                 //新增清单数据
                 await billsData.importBills(insertDatas);
                 //返回数据以更新前端

modules/main/controllers/project_controller.js

@@ -23,6 +23,12 @@ module.exports = {
         });
     },
     getData: function (req, res) {
+        //add
+        console.log(`------------------------------------------`);
+        console.log(req.session.sessionUser);
+        console.log(req.session.userAccount);
+        console.log(`------------------------------------------`);
+        //add
         var data = JSON.parse(req.body.data);
         // 注释代码用于测试getFilterData
         // Project.getFilterData(data.project_id, ['bills', 'projectGLJ'], function (err, result) {

modules/main/controllers/ration_controller.js

@@ -71,7 +71,7 @@ async function replaceRations(req,res) {
     try {
         let data = req.body.data;
         data = JSON.parse(data);
-        let userID = req.session.sessionUser.ssoId;
+        let userID = req.session.sessionUser.id;
         result.data = await ration_facade.replaceRations(userID,data);
     }catch (err){
         logger.err(err);

modules/main/routes/main_route.js

@@ -10,7 +10,7 @@ module.exports =function (app) {
     app.get('/main', baseController.init, function(req, res) {
         let pm = require('../../pm/controllers/pm_controller');
 
-        pm.checkProjectRight(req.session.sessionUser.ssoId, req.query.project, async function (hasRight) {
+        pm.checkProjectRight(req.session.sessionUser.id, req.query.project, async function (hasRight) {
             if (hasRight) {
                 // 获取项目信息
                 const projectId = req.query.project;
@@ -18,7 +18,7 @@ module.exports =function (app) {
                 res.render('building_saas/main/html/main.html',
                     {
                         userAccount: req.session.userAccount,
-                        userID: req.session.sessionUser.ssoId,
+                        userID: req.session.sessionUser.id,
                         projectData: projectData,
                     });
             } else {

modules/pm/controllers/pm_controller.js

@@ -25,7 +25,7 @@ module.exports = {
     checkRight: function (req, res) {
         let data = JSON.parse(req.body.data);
         if (data.user_id) {
-            return data.user_id === req.session.sessionUser.ssoId;
+            return data.user_id === req.session.sessionUser.id;
         } else {
             return false;
         }
@@ -46,7 +46,7 @@ module.exports = {
         });
     },
     getProjects: async function(req, res){
-         await ProjectsData.getUserProjects(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, function(err, message, projects){
+         await ProjectsData.getUserProjects(req.session.sessionUser.id, req.session.sessionCompilation._id, function(err, message, projects){
             if (projects) {
                 callback(req, res, err, message, projects);
             } else {
@@ -56,7 +56,7 @@ module.exports = {
     },
     updateProjects: async function (req, res) {
         let data = JSON.parse(req.body.data);
-        await ProjectsData.updateUserProjects(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, data.updateData, function (err, message, data) {
+        await ProjectsData.updateUserProjects(req.session.sessionUser.id, req.session.sessionCompilation._id, data.updateData, function (err, message, data) {
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {
@@ -119,13 +119,13 @@ module.exports = {
     updateFiles: async function(req, res){
         let data = JSON.parse(req.body.data);
         let updateDatas = data.updateDatas;
-        await ProjectsData.udpateUserFiles(req.session.sessionUser.ssoId, updateDatas, function (err, message, data) {
+        await ProjectsData.udpateUserFiles(req.session.sessionUser.id, updateDatas, function (err, message, data) {
             callback(req, res, err, message, data);
         });
     },
     copyProjects: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.copyUserProjects(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, data.updateData, function (err, message, data) {
+        ProjectsData.copyUserProjects(req.session.sessionUser.id, req.session.sessionCompilation._id, data.updateData, function (err, message, data) {
             if (err === 0) {
                 callback(req, res, err, message, data);
             } else {
@@ -135,13 +135,13 @@ module.exports = {
     },
     rename: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.rename(req.session.sessionUser.ssoId, req.session.sessionCompilation._id, data, function (err, message) {
+        ProjectsData.rename(req.session.sessionUser.id, req.session.sessionCompilation._id, data, function (err, message) {
             callback(req, res, err, message, null);
         });
     },
     getProject: function(req, res){
         let data = JSON.parse(req.body.data);
-        ProjectsData.getUserProject(req.session.sessionUser.ssoId, data.proj_id, async function(err, message, data){
+        ProjectsData.getUserProject(req.session.sessionUser.id, data.proj_id, async function(err, message, data){
             if (err === 0) {
                 let engineeringLibModel = new EngineeringLibModel();
                 let engineeringInfo = data !== null && data.property.engineering_id !== undefined ?
@@ -159,7 +159,7 @@ module.exports = {
     },
     beforeOpenProject: function (req, res) {
         let data = JSON.parse(req.body.data);
-        ProjectsData.beforeOpenProject(req.session.sessionUser.ssoId, data.proj_id, data.updateData, function (err, message, data) {
+        ProjectsData.beforeOpenProject(req.session.sessionUser.id, data.proj_id, data.updateData, function (err, message, data) {
             callback(req, res, err, message, data);
         });
     },
@@ -192,7 +192,7 @@ module.exports = {
 
         let renderData = {
             userAccount: request.session.userAccount,
-            userID: request.session.sessionUser.ssoId,
+            userID: request.session.sessionUser.id,
             compilationData: JSON.stringify(sessionCompilation),
             billValuation: JSON.stringify(billValuation),
             rationValuation: JSON.stringify(rationValuation),
@@ -259,7 +259,7 @@ module.exports = {
     },
 
     getGCDatas: async function(request, response) {
-        let userID = request.session.sessionUser.ssoId;
+        let userID = request.session.sessionUser.id;
         let compilatoinId = request.session.sessionCompilation._id;
         let rst = [];
         let _projs = Object.create(null), _engs = Object.create(null), prefix = 'ID_';
@@ -347,7 +347,7 @@ module.exports = {
     },
 
     recGC: function(request, response){
-        let userID = request.session.sessionUser.ssoId;
+        let userID = request.session.sessionUser.id;
         let data = JSON.parse(request.body.data);
         let nodes = data.nodes;
         ProjectsData.recGC(userID, nodes, function (err, msg, data) {

modules/ration_glj/facade/ration_glj_facade.js

@@ -515,7 +515,7 @@ async function getLibInfo(req) {
         gljLibId = engineeringInfo.glj_lib.length > 0 && typeof engineeringInfo.glj_lib !== 'undefined' ? engineeringInfo.glj_lib[0].id : null;
     }
     let data = {
-        userID: req.session.sessionUser.ssoId,
+        userID: req.session.sessionUser.id,
         gljLibId: gljLibId,
         compilationId: sessionCompilation._id
     };

modules/reports/controllers/rpt_controller.js

@@ -136,7 +136,7 @@ module.exports = {
             rptName = req.params.rptName,
             isOneSheet = req.params.isOneSheet,
             option = req.params.option;
-        let user_id = req.session.sessionUser.ssoId;
+        let user_id = req.session.sessionUser.id;
         let dftOption = option||JV.PAGING_OPTION_NORMAL;
         getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, dftOption, function(err, pageRst){
             try {
@@ -228,7 +228,7 @@ module.exports = {
             pageSize = req.params.size,
             rptName = req.params.rptName
         ;
-        let user_id = req.session.sessionUser.ssoId;
+        let user_id = req.session.sessionUser.id;
         getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, JV.PAGING_OPTION_NORMAL, function(err, pageRst){
             rpt_pdf_util.export_pdf_file(pageRst, pageSize, rptName,function (newName) {
                 res.setHeader('Content-Type', 'application/vnd.openxmlformats');