fix: 西养护日常在计算综合电价时报错问题

modules/glj/controllers/glj_controller.js

@@ -450,9 +450,9 @@ class GLJController extends BaseController {
         let result={error:0};
         try {
             let data = JSON.parse(request.body.data);
-            result.data = await glj_facade.insertElectrovalence(data,request.session.sessionCompilation._id);
+            result.data = await glj_facade.insertElectrovalence(data.glj,data.engineerID);
         }catch (err){
-            logger.err(err);
+            logger.err(err.stack);
             result.error=1;
             result.message = err.message;
         }

modules/glj/facade/glj_facade.js

@@ -223,11 +223,11 @@ async function getUserFreights(req) {
 }
 
 //插入综合电价中的属性
-async function insertElectrovalence(data,compilationID) {
+async function insertElectrovalence(data,engineerID) {
     let result = {};
     let projectGljModel = new GLJListModel();
-    let lib = await std_glj_lib_model.findOne({compilationId:compilationID}).lean();
-    let stdGLJs = await std_glj_lib_gljList_model.find({'repositoryId':lib.ID,'code':data.code}).lean();
+    let libID = await ration_glj.getGLJLibByEngineerID(engineerID)
+    let stdGLJs = await std_glj_lib_gljList_model.find({'repositoryId':libID,'code':data.code}).lean();
     for(let std of stdGLJs){
         let sIndex = projectGljModel.getIndex(std,['code','specs','unit','gljType']);//机械台班下拉列表名字里kw和数据库里名字kw大小写不一致，忽略名字做对应
         if(sIndex == projectGljModel.getIndex(data,['code','specs','unit','type'])){

web/building_saas/main/js/views/electrovalence_view.js

@@ -300,8 +300,9 @@ let electrovalenceObj = {
           projectID: projectObj.project.ID()
         };
         tem.ID = uuid.v1();
+        let engineerID = projectObj.project.projectInfo.property.engineering_id;
         $.bootstrapLoading.start();
-        let result = await ajaxPost('/glj/insertElectrovalence', tem);
+        let result = await ajaxPost('/glj/insertElectrovalence', {engineerID,glj:tem});
         //插入项目工料机列表
         if (type == "add" && (!result.projetcGLJData || result.projetcGLJData.length == 0)) {
           alert("没有找到该工料机，请检查工料机库");