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 | 5 +++--
Source/plt-web/plt-web-parent/plt-web/src/main/resources/DefaultAttribute.json | 2 +-
2 files changed, 4 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 4b60a12..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
@@ -443,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());
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/DefaultAttribute.json b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/DefaultAttribute.json
index be5ffaf..df32497 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/DefaultAttribute.json
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/DefaultAttribute.json
@@ -20,7 +20,7 @@
{"OID":"5f4e6bfe-58ed-44dd-87f7-2db3bde1084d", "ID":"creator", "NAME":"鍒涘缓浜�", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTString", "ATTRIBUTEDATATYPETEXT":"瀛楃涓�", "NULLABLEFLAG":"false", "DEFAULTVALUE":null, "ENUMID":null, "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":50, "PRECISIONLENGTH":0, "SCALELENGTH":2, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
{"OID":"b019d1ed-eb6c-4778-9688-d0bdefc424c4", "ID":"revisionseq", "NAME":"鐗堟湰鐨勯『搴�", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTInteger", "ATTRIBUTEDATATYPETEXT":"鏁板瓧", "NULLABLEFLAG":"true", "DEFAULTVALUE":null, "ENUMID":null, "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":0, "PRECISIONLENGTH":null, "SCALELENGTH":null, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
{"OID":"6f875594-7bc0-4619-ac41-03e05b62ee76", "ID":"checkouttime", "NAME":"绛惧嚭鏃堕棿", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTDateTime", "ATTRIBUTEDATATYPETEXT":"鏃ユ湡鏃堕棿", "NULLABLEFLAG":"true", "DEFAULTVALUE":null, "ENUMID":null, "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":0, "PRECISIONLENGTH":null, "SCALELENGTH":null, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
- {"OID":"4c3cb386-2b2e-44dc-8abe-f7cea714dae1", "ID":"secretgrade", "NAME":"瀵嗙骇", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTInteger", "ATTRIBUTEDATATYPETEXT":"鏁板瓧", "NULLABLEFLAG":"true", "DEFAULTVALUE":null, "ENUMID":"Enumsecretgrade", "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":0, "PRECISIONLENGTH":null, "SCALELENGTH":null, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
+ /*{"OID":"4c3cb386-2b2e-44dc-8abe-f7cea714dae1", "ID":"secretgrade", "NAME":"瀵嗙骇", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTInteger", "ATTRIBUTEDATATYPETEXT":"鏁板瓧", "NULLABLEFLAG":"true", "DEFAULTVALUE":null, "ENUMID":"Enumsecretgrade", "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":0, "PRECISIONLENGTH":null, "SCALELENGTH":null, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},*/
{"OID":"fc77bab5-8d18-47ff-8f60-6b13124b0b2e", "ID":"oid", "NAME":"涓婚敭", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTString", "ATTRIBUTEDATATYPETEXT":"瀛楃涓�", "NULLABLEFLAG":"false", "DEFAULTVALUE":null, "ENUMID":null, "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":150, "PRECISIONLENGTH":0, "SCALELENGTH":2, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
{"OID":"4f0dcea2-c10f-4979-b1c2-ce8db3bfa478", "ID":"checkoutby", "NAME":"绛惧嚭浜�", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTString", "ATTRIBUTEDATATYPETEXT":"瀛楃涓�", "NULLABLEFLAG":"true", "DEFAULTVALUE":null, "ENUMID":null, "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":50, "PRECISIONLENGTH":0, "SCALELENGTH":2, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
{"OID":"fb1242e7-aebc-49f1-8ef7-a40f87cbc5be", "ID":"nameoid", "NAME":"瀵硅薄涓婚敭", "DESCRIPTION":null, "ATTRIBUTEDATATYPE":"VTString", "ATTRIBUTEDATATYPETEXT":"瀛楃涓�", "NULLABLEFLAG":"true", "DEFAULTVALUE":null, "ENUMID":null, "ENUMNAME":null, "BTMTYPEID":null, "BTMTYPENAME":null, "ATTRLENGTH":50, "PRECISIONLENGTH":0, "SCALELENGTH":2, "RANGE":null, "BTMNAME":"attribute", "OWNER":"developer", "CREATOR":"developer", "CREATETIME":"2020-06-29 10:33:47", "LASTMODIFIER":"sysAdmin", "LASTMODIFYTIME":"2022-03-30 19:04:08", "TS":"2022-03-30 19:04:08"},
--
Gitblit v1.9.3