From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
index 2988f09..666d847 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java
@@ -1760,6 +1760,9 @@
                         AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(abName_);
                         if(att == null || "".equals(att.oid)){
                             att = allSysAttr.get(abName_.toLowerCase());
+                            if(att == null || "".equals(att.oid)){
+                                continue;
+                            }
                         }
                         att.name = pName + abName_ ;
                         AttributeDefDTO attrDto = new AttributeDefDTO();

--
Gitblit v1.9.3