From da16a45377ebd278be00b2ce90034e5898390763 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十二月 2024 18:01:43 +0800
Subject: [PATCH] 查询模板默认字段查询去掉checkin等四个字段,修改查询模板查询接口中的属性查询改为一次性加载到本地。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 83fe6b7..2988f09 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
@@ -29,6 +29,7 @@
 import com.vci.web.service.OsQuereyTemplateServiceI;
 import com.vci.web.util.PlatformClientUtil;
 import com.vci.web.util.WebUtil;
+import com.vci.web.utility.AttributeDataFetcher;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.dom4j.DocumentException;
@@ -1670,6 +1671,8 @@
         }else {
             qtdArray = platformClientUtil.getQTDService().getBizTypeQTDs(btmName);
         }
+        //鑾峰彇灞炴�х殑鏁版嵁鍔犺浇绫�
+        AttributeDataFetcher attrDataFetcher = new AttributeDataFetcher();
         for (QTD qtd : qtdArray) {
             QTDDTO qtddto = new QTDDTO();
             qtddto.setName(qtd.name);
@@ -1678,7 +1681,8 @@
             qtddto.setBtmName(qtd.btmName);
             qtddto.setCreator(qtd.creator);
             for (String abName : qtd.abNames) {
-                AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(abName);
+                //AttributeDef att = platformClientUtil.getAttributeService().getAttributeDefByName(abName);
+                AttributeDef att = attrDataFetcher.getAttributeDef(abName);
                 //濡傛灉鍦ㄥ睘鎬ф帴鍙d腑娌℃湁鏌ュ埌鐩稿叧瀛楁搴旇灏卞湪榛樿瀛楁涓�
                 if(att == null || "".equals(att.oid)){
                     att = allSysAttr.get(abName.toLowerCase());
@@ -1775,6 +1779,9 @@
                     //绯荤粺灞炴�D,NAME,DESCRIPTION
                     for (int i = 0; i < SystemAttribute.bosysAttList().size(); i++) {
                         AttributeDef attributeDef = allSysAttr.get(SystemAttribute.bosysAttList().get(i).toLowerCase());
+                        if(Func.isEmpty(attributeDef)){
+                            break;
+                        }
                         AttributeDefDTO attrDto = new AttributeDefDTO();
                         attrDto.setDescription(attributeDef.description);
                         attrDto.setLabel(attributeDef.label);

--
Gitblit v1.9.3