|
@@ -172,7 +172,7 @@ async function getDefaultProgramID(data) {
|
|
|
let searchDao = new SearchDao();
|
|
|
let programID;
|
|
|
let std = await searchDao.getRationItem(data.userID,data.compilationId,[data.libID],data.code, null);
|
|
|
- if(std && (std.feeType == undefined || std.feeType == null || std.feeType =='')){//定额取费专业为空的情况下,取项目属性中的定额取费专业ID
|
|
|
+ if(std == null||std ==undefined || std.feeType == undefined || std.feeType == null || std.feeType ==''){//定额取费专业为空的情况下,取项目属性中的定额取费专业ID
|
|
|
programID = await getProgramForProject(data.projectID);
|
|
|
}else {
|
|
|
programID = std.feeType;
|
|
@@ -517,7 +517,7 @@ function createRationAss(std) {
|
|
|
if(std.hasOwnProperty('rationAssList')&&std.rationAssList.length>0){
|
|
|
for(let i=0;i<std.rationAssList.length;i++){
|
|
|
let ass = std.rationAssList[i];
|
|
|
- ass.actualValue = ass.stdValue;
|
|
|
+ ass._doc.actualValue = ass.stdValue;
|
|
|
rationAssList.push(ass);
|
|
|
}
|
|
|
}
|