From f40bc0123e0268fe147c2c89b697be1047adc198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E4=B8=9C=E5=BC=BA?= <1559301693@qq.com>
Date: Wed, 24 Sep 2025 17:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A9=BA=E6=8C=87=E9=92=88?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/util/DesignerVersionUtil.java     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

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());