From 75007678d3d1c03d8a6b99bd84332e7ad91f38fd Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期五, 09 六月 2023 18:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
index c5f1306..d98174c 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -116,15 +116,10 @@
@Override
public List<BtmTypeVO> applyRange(String oid) {
List<BtmType> btmTypes = baseMapper.selectApplyRange(oid);
- if (!CollectionUtils.isEmpty(btmTypes)){
- return btmTypes.stream().map(btm -> {
- BtmTypeVO vo = new BtmTypeVO();
- vo.setId(btm.getId());
- vo.setName(btm.getName());
- return vo;
- }).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(btmTypes)){
+ return null;
}
- return null;
+ return BtmTypeWrapper.build().listEntityVO(btmTypes);
}
/**
--
Gitblit v1.9.3