From ed38499b75ab101109c3d2b6b7cc95034f868be3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 14 十一月 2024 17:26:22 +0800
Subject: [PATCH] 模板属性查询，配置去除密级为默认属性
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 2eff972..325921d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -246,7 +246,7 @@
vo.setDelimiter(btmItem.delimiter);
vo.setfName(btmItem.fName);
vo.setVersionRule(String.valueOf(btmItem.verRuleName));
- if (StringUtils.isNotBlank(vo.getRevisionRuleName()) || vo.isInputRevisionFlag()) {
+ if (StringUtils.isNotBlank(vo.getRevisionRuleId()) || vo.isInputRevisionFlag()) {
vo.setRevisionFlag(true);
}
vo.setLifeCycleIds(Arrays.stream(btmItem.lifeCycles).collect(Collectors.joining(",")));
@@ -313,6 +313,25 @@
}
return self.selectAllBtmMap().getOrDefault(id.toLowerCase(), null);
}
+
+ /**
+ * 浣跨敤绫诲瀷鍚嶈幏鍙栦笟鍔＄被鍨�,鏌ヤ笉鍒扮洿鎺ユ姤閿�
+ * @param btmName 绫诲瀷鍚�
+ * @return 涓氬姟绫诲瀷
+ * @throws
+ */
+ @Override
+ public OsBtmTypeVO getBtmByName(String btmName) throws PLException{
+ if(Func.isBlank(btmName)){
+ throw new PLException("500",new String[]{"鏌ヨ鏉′欢绫诲瀷鍚嶄笉鑳戒负绌猴紒"});
+ }
+ BizType bizType = platformClientUtil.getBtmService().getBizTypeByName(btmName);
+ if(Func.isEmpty(bizType) || Func.isBlank(bizType.oid)){
+ throw new PLException("500",new String[]{"鏍规嵁銆�"+btmName+"銆戞湭鏌ヨ鍒板搴斾笟鍔＄被鍨嬶紒"});
+ }
+ return btmDO2VO(bizType,null);
+ }
+
/**
* 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
*
@@ -424,9 +443,10 @@
if (attrVOs == null) {
attrVOs = new ArrayList<>();
}
- if (!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())) {
+ List<OsAttributeVO> defaultAttributeVOs = attributeService.getDefaultAttributeVOs();
+ if (!CollectionUtils.isEmpty(defaultAttributeVOs)) {
List<OsBtmTypeAttributeVO> finalAttrVOs = attrVOs;
- attributeService.getDefaultAttributeVOs().stream().forEach(attr -> {
+ defaultAttributeVOs.stream().forEach(attr -> {
OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO();
BeanUtil.convert(attr, attributeVO);
attributeVO.setAttributeDataType(attr.getAttributeDataType());
--
Gitblit v1.9.3