From 00bd6af8d8d098f6165bd4923a22e1d4646176fe Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 10 Dec 2024 17:39:33 +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

---
 .../bonus/material/device/mapper/DevInfoMapper.java   |  2 +-
 .../device/service/impl/DevInfoServiceImpl.java       | 11 ++++-------
 .../mapper/material/device/DevInfoMapper.xml          |  1 +
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
index b0904ee..0e1e20c 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java
@@ -128,7 +128,7 @@ public interface DevInfoMapper {
 
     List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo);
 
-    List<DevInfoPropertyVo> selectDevInfoProperties();
+    List<DevInfoPropertyVo> selectDevInfoProperties(@Param("maId")Long maId);
 
     int deleteDevInfoProperties(@Param("maId")Long maId);
 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
index a389772..5ae430c 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
@@ -137,6 +137,9 @@ public class DevInfoServiceImpl implements DevInfoService {
             if (!CollectionUtils.isEmpty(leaseList)) {
                 devInfoVo.setLeaseList(leaseList);
             }
+            //查询自定义属性
+            List<DevInfoPropertyVo> properties = devInfoMapper.selectDevInfoProperties(maId);
+            devInfoVo.setDevInfoProperties(properties);
         }
         return devInfoVo;
     }
@@ -548,13 +551,7 @@ public class DevInfoServiceImpl implements DevInfoService {
     @Override
     public List<DevInfoVo> selectDevInfoLists(DevInfoVo devInfo) {
         devInfo.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId().toString());
-        List<DevInfoVo> devInfoVos = devInfoMapper.selectDevInfoLists(devInfo);
-        List<DevInfoPropertyVo> devInfoProperties = devInfoMapper.selectDevInfoProperties();
-        Map<Long, List<DevInfoPropertyVo>> map = devInfoProperties.stream().collect(Collectors.groupingBy(DevInfoPropertyVo::getMaId));
-        for (DevInfoVo devInfos : devInfoVos) {
-            devInfos.setDevInfoProperties(map.get(devInfos.getMaId()));
-        }
-        return devInfoVos;
+        return devInfoMapper.selectDevInfoLists(devInfo);
     }
 
     /**
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 548de13..754f0c4 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -536,6 +536,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                property_name as propertyName,
                property_value as propertyValue
         from ma_dev_info_properties
+        where ma_id = #{maId}
     </select>
 
     <delete id="deleteDevInfoProperties">