档案元数据收集非空判断

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/MetadataClassificationServiceImpl.java

@@ -27,6 +27,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.entity.ArchiveTreeContract;
 import org.springblade.manager.entity.ContractInfo;
+import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.enums.StorageTypeEnum;
 import org.springblade.manager.feign.ArchiveTreeContractClient;
 import org.springblade.manager.feign.ContractClient;
@@ -1059,7 +1060,7 @@ public class MetadataClassificationServiceImpl
         keyValue.put("题名", file.getFileName());
         // 关键词生成
         String keyWords = "";
-        if (file.getSourceType() == 1) {
+        if (file.getSourceType() != null && file.getSourceType() == 1) {
             // 原生文件:捕获当前文件所在的工序节点名称
             keyWords = currentNode.getNodeName();
         } else {
@@ -1094,11 +1095,11 @@ public class MetadataClassificationServiceImpl
         keyValue.put("主题", file.getFileName());
         keyValue.put("拍摄时间", file.getFilmingTime());
         // 拍摄地点：捕获当前照片所在部位的分项工程节点名称
-        if (currentNode.getExtNodeType() == 4) {
+        if (currentNode.getExtNodeType() != null && currentNode.getExtNodeType() == 4) {
             keyValue.put("拍摄地点", currentNode.getNodeName());
         } else {
             for (ArchiveTreeContract archiveTreeContract : ancestorList) {
-                if (archiveTreeContract.getExtNodeType() == 4) {
+                if (archiveTreeContract.getExtNodeType() != null && archiveTreeContract.getExtNodeType() == 4) {
                     keyValue.put("拍摄地点", archiveTreeContract.getNodeName());
                     break;
                 }