From ac3f3629a261770f573f27e5e23f7ec19d096c2a Mon Sep 17 00:00:00 2001 From: xiejun <xiejun@vci-tech.com> Date: 星期三, 04 九月 2024 18:29:05 +0800 Subject: [PATCH] UI授权功能查询 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java index 95693ac..7faff82 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java @@ -735,7 +735,7 @@ OsBtmTypeAttributeVO idAttrVO = new OsBtmTypeAttributeVO(); idAttrVO.setId("id"); idAttrVO.setName("缂栧彿"); - idAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name()); + idAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name()); idAttrVO.setAttributeLength(50); idAttrVO.setNullableFlag(true); attributes.add(idAttrVO); @@ -743,7 +743,7 @@ OsBtmTypeAttributeVO nameAttrVO = new OsBtmTypeAttributeVO(); nameAttrVO.setId("name"); nameAttrVO.setName("鍚嶇О"); - nameAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name()); + nameAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name()); nameAttrVO.setAttributeLength(50); nameAttrVO.setNullableFlag(true); attributes.add(nameAttrVO); @@ -751,7 +751,7 @@ OsBtmTypeAttributeVO descAttrVO = new OsBtmTypeAttributeVO(); descAttrVO.setId("description"); descAttrVO.setName("鎻忚堪"); - descAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name()); + descAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name()); descAttrVO.setAttributeLength(150); descAttrVO.setNullableFlag(true); attributes.add(descAttrVO); @@ -851,7 +851,13 @@ if(!CollectionUtils.isEmpty(btmTypeVOList)) { btmTypeVOList.stream().forEach(btmTypeVO -> { String btmId = btmTypeVO.getId(); - List<OsBtmTypeAttributeVO> attributeVOS = btmService.listAttributeByBtmId(btmId); + List<OsBtmTypeAttributeVO> attributeVOS = null; + try { + attributeVOS = btmService.listAttributeByBtmId(btmId); + } catch (PLException e) { + e.printStackTrace(); + throw new VciBaseException(VciBaseUtil.getExceptionMessage(e)); + } //鍏堟槸鍚嶇О int rowIndex = index[0]; WriteExcelData idED = new WriteExcelData(rowIndex, 0, btmId); @@ -894,7 +900,7 @@ //鐒跺悗灞炴�х殑涓枃鍚嶇О rowDataList.add(new WriteExcelData(rowIndex, 3, attributeVO.getName())); //灞炴�х殑绫诲瀷 - rowDataList.add(new WriteExcelData(rowIndex, 4, VciFieldTypeEnum.getTextByValue(attributeVO.getAttrDataType()))); + rowDataList.add(new WriteExcelData(rowIndex, 4, VciFieldTypeEnum.getTextByValue(attributeVO.getAttributeDataType()))); //鏄惁鍙互涓虹┖ rowDataList.add(new WriteExcelData(rowIndex, 5, attributeVO.isNullableFlag() ? "鏄�" : "鍚�")); //灞炴�ч暱搴� @@ -1064,7 +1070,7 @@ } columnData.put(wordFieldProperties.getColumnId(),btmTypeAttributeVO.getId().toLowerCase()); columnData.put(wordFieldProperties.getColumnName(),btmTypeAttributeVO.getName()); - String attrDataType = btmTypeAttributeVO.getAttrDataType(); + String attrDataType = btmTypeAttributeVO.getAttributeDataType(); String columnType = VciFieldTypeEnum.getTextByValue(attrDataType); if(StringUtils.isBlank(columnType)){ columnType = "瀛楃涓�"; @@ -1194,15 +1200,8 @@ } else { btmItem.verRuleName = 0; } - //鍖呭惈鐨勫睘鎬х殑鏁扮粍 - List<OsBtmTypeLinkAttributesDTO> attributesDTOList = btmTypeDTO.getAttributes(); - List<String> attrIdList = new ArrayList<String>(); - if (!CollectionUtils.isEmpty(attributesDTOList)) { - for (OsBtmTypeLinkAttributesDTO attr : attributesDTOList) { - attrIdList.add(attr.getId().toLowerCase()); - } - } - btmItem.apNameArray = attrIdList.toArray(new String[0]); + //鍖呭惈鐨勫睘鎬у悕绉� + btmItem.apNameArray = btmTypeDTO.getApNameArray().split(","); } /** -- Gitblit v1.9.3