|
@@ -587,7 +587,14 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
Map<String, Map<String, ObjectInfoDefine>> allInfoMap = infoService.queryByTypes(typeCodeList);
|
|
|
// 信息点校验器
|
|
|
for(ObjectDigital vo:voList) {
|
|
|
- Map<String, ObjectInfoDefine> infoMap = allInfoMap.get(vo.getClassCode());
|
|
|
+ //设置自定义信息点
|
|
|
+ Map<String, ObjectInfoDefine> infoMap = new HashMap<>();
|
|
|
+ if(CollUtil.isNotEmpty(allInfoMap)){
|
|
|
+ Map<String, ObjectInfoDefine> infoDefineMap = allInfoMap.get(vo.getClassCode());
|
|
|
+ if(CollUtil.isNotEmpty(infoDefineMap)){
|
|
|
+ infoMap.putAll(infoDefineMap);
|
|
|
+ }
|
|
|
+ }
|
|
|
String objType = objTypeMap.get(vo.getClassCode());
|
|
|
//设置通用信息点
|
|
|
if(!objType.equals(vo.getClassCode())){
|