diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/DesignerVersionUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/DesignerVersionUtil.java index 71225638..7f0ae496 100644 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/DesignerVersionUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/DesignerVersionUtil.java @@ -2,17 +2,10 @@ package com.actionsoft.apps.coe.pal.pal.repository.designer.util; import java.sql.Timestamp; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; +import jodd.util.StringUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.IteratorUtils; import org.slf4j.Logger; @@ -777,7 +770,12 @@ public class DesignerVersionUtil { String relationTyp = refObj.containsKey("type") ? refObj.getString("type") : "shape"; String relationFileId = relationModel.getRelationFileId(); if ("file".equals(relationTyp)) { - listOfFileAttrValue.add(PALRepositoryCache.getCache().get(relationFileId).getName()); + PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(relationFileId); + if (Objects.nonNull(palRepositoryModel)&& StringUtil.isNotBlank(palRepositoryModel.getName())){ + listOfFileAttrValue.add(PALRepositoryCache.getCache().get(relationFileId).getName()); + }else { + System.out.println("文件不存在:" + relationFileId); + } listOfCompareAccord.add(relationFileId); } else { listOfFileAttrValue.add(relationModel.getRelationShapeText());