Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/main/facade/ration_facade.js

@@ -863,7 +863,7 @@ async function getMixRatioInfo(projectID,projectGLJMap,newProjectGLJList,mixRati
 
   // 1. 先检查现在的组成物表中，是否有相关信息 - 生成映射记录
   if(connectKeyList.length > 0){//有组成物的话从数据库中取出组成物信息
-    let mixRatioList = await mixRatioModel.find({'unit_price_file_id': unitPriceFileId}).lean();
+    let mixRatioList = await mixRatioModel.find({'unit_price_file_id': unitPriceFileId,'connect_key': {'$in':connectKeyList}}).lean();
     for(let m of mixRatioList){
         //组成物信息分组，查看哪些是已经存在的
        existMixRatioMap[m.connect_key]?existMixRatioMap[m.connect_key].push(m):existMixRatioMap[m.connect_key]=[m];