From 980527ffa202583e691eeb41acc652f4e3147973 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Mon, 4 Dec 2023 20:21:27 +0800
Subject: [PATCH] fix

---
 .../com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java  | 1 +
 .../zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
index 40f8135..bb10190 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java
@@ -17,6 +17,7 @@ public class DevInfoVo extends DevInfo {
     private String groupName;
     /* 装备名称 child */
     private String deviceName;
+    private int collectId;
     private String companyName;
     private String keyWord;
 }
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index 6c94206..33eb474 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -79,9 +79,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
-        select d.*,c.company_name,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name
+        select d.*,c.company_name,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name,col.id as collect_id
         from ma_dev_info d
                  left join bm_company_info c on d.own_co = c.company_id
+                 left join ma_user_collect col on d.ma_id = col.ma_id
                  left join (
             select tt.*, pp.type_name as grandpa_name from
                 (select t.*, p.type_name as parent_name,p.type_id as p_type_id, p.parent_id as p_parent_id