yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加空指针判断处理

Browse Source
This commit is contained in:
袁东强 2025-09-24 17:21:44 +08:00
parent 3eb307dcc4
commit f40bc0123e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/util/DesignerVersionUtil.java
View File

@ -2,17 +2,10 @@ package com.actionsoft.apps.coe.pal.pal.repository.designer.util;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
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.stream.Collectors; import java.util.stream.Collectors;
import jodd.util.StringUtil;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.IteratorUtils; import org.apache.commons.collections.IteratorUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -777,7 +770,12 @@ public class DesignerVersionUtil {
String relationTyp = refObj.containsKey("type") ? refObj.getString("type") : "shape"; String relationTyp = refObj.containsKey("type") ? refObj.getString("type") : "shape";
String relationFileId = relationModel.getRelationFileId(); String relationFileId = relationModel.getRelationFileId();
if ("file".equals(relationTyp)) { 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); listOfCompareAccord.add(relationFileId);
} else { } else {
listOfFileAttrValue.add(relationModel.getRelationShapeText()); listOfFileAttrValue.add(relationModel.getRelationShapeText());