|
@@ -2330,7 +2330,7 @@ async function handleMainProjectDatas(mainData,updateData,userID) {
|
|
|
tasks.push({updateOne:{filter : updateData.update.query, update : {NextSiblingID:mainProjectID}}});
|
|
tasks.push({updateOne:{filter : updateData.update.query, update : {NextSiblingID:mainProjectID}}});
|
|
|
}
|
|
}
|
|
|
//查看是否重名;
|
|
//查看是否重名;
|
|
|
- let temp = await projectModel.findOne({userID:userID,ParentID:p.ParentID,name:p.name});
|
|
|
|
|
|
|
+ let temp = await projectModel.findOne({userID:userID,ParentID:p.ParentID,name:p.name, $or: notDeleted});
|
|
|
if(temp) throw new Error(`已存在建设项目“${p.name}”`);
|
|
if(temp) throw new Error(`已存在建设项目“${p.name}”`);
|
|
|
// p.name = p.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '导入)';
|
|
// p.name = p.name + '(' + moment(Date.now()).tz("Asia/Shanghai").format('MM-DD HH:mm:ss') + '导入)';
|
|
|
}else {
|
|
}else {
|