|
@@ -84,7 +84,13 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
|
Map<String, String> typeMap = typeService.queryObjTypeMap();
|
|
|
voList.forEach(vo -> {
|
|
|
// 生成ID
|
|
|
- vo.setId(DigitalCommonUtils.fetchObjectId(vo.getProjectId(), vo.getObjType()));
|
|
|
+ if (StrUtil.isBlank(vo.getId())){
|
|
|
+ if (StrUtil.isNotBlank(vo.getObjType())){
|
|
|
+ vo.setId(DigitalCommonUtils.fetchObjectId(vo.getProjectId(), vo.getObjType()));
|
|
|
+ }else {
|
|
|
+ vo.setId(DigitalCommonUtils.fetchObjectId(vo.getProjectId(), typeMap.get(vo.getClassCode())));
|
|
|
+ }
|
|
|
+ }
|
|
|
//设置对象类型-objType
|
|
|
vo.setObjType(typeMap.get(vo.getClassCode()));
|
|
|
vo.setValid(ValidEnum.TRUE.getType());
|