|
@@ -146,7 +146,7 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
dataMerge(newDbVO,vo,commonInfoMap,fieldSet);
|
|
|
}
|
|
|
// 合并对象分类信息点数据
|
|
|
- Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.get(vo.getClassCode());
|
|
|
+ Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.getOrDefault(vo.getClassCode(),new HashMap<>());
|
|
|
dataMerge(newDbVO,vo,infoDefineMap,fieldSet);
|
|
|
|
|
|
//移除需要删除的信息点
|