From 9dc5902df36d375d1387dbc7942d415cb643b39e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 10 Dec 2024 10:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ma/service/impl/MaTypeServiceImpl.java         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java
index b3a1750..0763d05 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/service/impl/MaTypeServiceImpl.java
@@ -2,7 +2,6 @@ package com.bonus.material.ma.service.impl;
 
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.StringUtils;
-import com.bonus.material.device.domain.DevInfo;
 import com.bonus.material.ma.mapper.MaTypeFileMapper;
 import com.bonus.material.ma.mapper.MaTypeMapper;
 import com.bonus.material.ma.service.ITypeService;
@@ -210,6 +209,14 @@ public class MaTypeServiceImpl implements ITypeService {
     @Override
     public List<TreeSelect> getMaTypeList(String typeName, String parentId) {
         List<MaType> maTypes = maTypeMapper.selectMaTypeTree(parentId);
+        //填充自定义属性
+        fillProperties(maTypes);
+        List<TreeSelect> treeSelectList = buildDeptTreeSelect(maTypes);
+        //如果没有查询到那么返回空
+        return treeSelectList;
+    }
+
+    private void fillProperties(List<MaType> maTypes) {
         List<MaTypeProperty> maTypeProperties = maTypeMapper.selectMaTypePropertyNames();
         Map<Long, List<MaTypeProperty>> maTypePropertiesMap = new HashMap<>();
         if (!CollectionUtils.isEmpty(maTypeProperties)) {
@@ -221,9 +228,6 @@ public class MaTypeServiceImpl implements ITypeService {
                 maType.setPropertyNames(tmpPropList.stream().map(o -> o.getPropertyName()).collect(Collectors.toList()));
             }
         }
-        List<TreeSelect> treeSelectList = buildDeptTreeSelect(maTypes);
-        //如果没有查询到那么返回空
-        return treeSelectList;
     }
 
     @Override
@@ -373,6 +377,8 @@ public class MaTypeServiceImpl implements ITypeService {
     @Override
     public List<MaType> getEquipmentType(Long typeId, String typeName) {
         List<MaType> maTypes = maTypeMapper.selectMaTypeList("");
+        //填充自定义属性
+        fillProperties(maTypes);
         List<MaType> list = new ArrayList<>();
         for (MaType maType : maTypes) {
             if (maType.getParentId() == 0) {