From 5e470575a3145278c0ee1bac39783b2075f4f066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BB=B4=E4=BC=9F?= <chenweiwei@axzo.cn>
Date: Tue, 5 Dec 2023 14:08:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=80=BB=E8=BE=91:=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BA=A7=E5=93=81=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/repository/entity/ProductModule.java   | 15 +++++++++++++++
 .../server/service/impl/ProductServiceImpl.java   |  7 +++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/ProductModule.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/ProductModule.java
index aae6f5aa..8d9bb5af 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/ProductModule.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/ProductModule.java
@@ -6,8 +6,14 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * saas-产品表(SaasProduct)表实体类
@@ -85,5 +91,14 @@ public class ProductModule extends BaseEntity<ProductModule> {
     protected Serializable pkVal() {
         return this.id;
     }
+
+    public List<Integer> parseOuType() {
+        if (StringUtils.isNotBlank(this.ouType)) {
+            return Arrays.asList(this.ouType.split(",")).stream().map(e -> Integer.valueOf(e.trim())).collect(Collectors.toList());
+        } else {
+            // 避免下游空指针
+            return new ArrayList<>();
+        }
+    }
 }
 
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
index 8f0a646b..a1253fb3 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
@@ -61,7 +61,7 @@ public class ProductServiceImpl implements ProductService {
         ArrayList<ProductVO> result = new ArrayList<>();
         list.forEach(e -> {
             ProductVO product = BeanMapper.copyBean(e, ProductVO.class);
-            product.setOuTypes(Arrays.stream(e.getOuType().split(",")).filter(org.apache.commons.lang3.StringUtils::isNotBlank).map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList()));
+            product.setOuTypes(e.parseOuType());
             result.add(product);
         });
         return ApiResult.ok(BeanMapper.copyList(list, ProductVO.class));
@@ -81,7 +81,10 @@ public class ProductServiceImpl implements ProductService {
 
     @Override
     public ApiResult<ProductVO> getById(Long id) {
-        return ApiResult.ok(BeanMapper.copyBean(productModuleDao.getById(id), ProductVO.class));
+        ProductModule byId = productModuleDao.getById(id);
+        ProductVO productVO = BeanMapper.copyBean(byId, ProductVO.class);
+        productVO.setOuTypes(byId.parseOuType());
+        return ApiResult.ok(productVO);
     }
 
     @Override