From f49622515192a11878628b8eecbc7315671ae562 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期四, 09 一月 2025 15:25:25 +0800
Subject: [PATCH] 在获取相关业务类型下的属性时，未在属性中定义的数据直接跳过
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsQueryTemplateImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 72cc064..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
@@ -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;
@@ -206,7 +207,7 @@
qtInfoDTO.setCreateTimeText(DateFormatUtils.format(new Date(obj.createTime), DateUtil.PATTERN_DATETIME));
dtos.add(qtInfoDTO);
}
- //// TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
+ // TODO: 2024/12/2 Ludc 杩斿洖鍊兼帓搴�
dtos = dtos.stream().sorted(Comparator.comparing(QTInfoDTO::getQtName,String.CASE_INSENSITIVE_ORDER)).collect(Collectors.toList());
return BaseResult.dataList(dtos);
}
@@ -434,7 +435,7 @@
//娣诲姞涓氬姟绫诲瀷鏍硅妭鐐�
for (LinkType plAction : linkTypes) {
HashMap<String,Object> childTree = new HashMap();
- childTree.put("text", plAction.tag + "/" +plAction.name);
+ childTree.put("text", plAction.label + "/" +plAction.name);
childTree.put("oid", plAction.oid);
// tree.put("children", childTree);
addExportTreeNode(plAction, qts, childTree);
@@ -1110,7 +1111,7 @@
//娣诲姞涓氬姟绫诲瀷鏍硅妭鐐�
for (LinkType plAction : ltsNew) {
HashMap<String,Object> childTree = new HashMap();
- childTree.put("text", plAction.tag + "/" +plAction.name);
+ childTree.put("text", plAction.label + "/" +plAction.name);
childTree.put("oid", plAction.oid);
addExportTreeNode(plAction, qts, childTree);
childList.add(childTree);
@@ -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);
//濡傛灉鍦ㄥ睘鎬ф帴鍙ｄ腑娌℃湁鏌ュ埌鐩稿叧瀛楁搴旇灏卞湪榛樿瀛楁涓�
if(att == null || "".equals(att.oid)){
att = allSysAttr.get(abName.toLowerCase());
@@ -1756,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();
@@ -1775,6 +1782,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