From 4e05bc5415b40e917a40ad3d55b6a55624bfa210 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Tue, 5 Dec 2023 14:40:39 +0800
Subject: [PATCH] fix

---
 .../com/bonus/zlpt/common/core/domain/equip/vo/DevInfoVo.java | 1 +
 .../zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml    | 4 +++-
 2 files changed, 4 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 f7a9f67..413ac69 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
@@ -25,4 +25,5 @@ public class DevInfoVo extends DevInfo {
     private String keyWord;
     /* 是否审核通过, ma_up_off:status, 1=通过, 2驳回 */
     private String isAudit;
+    private Long searchNum;
 }
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 3870e94..c2b3d2d 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -88,11 +88,13 @@ 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,c.auth_phone,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name,col.id as collect_id, up.status as is_audit
+        select d.*,c.company_name,c.auth_phone,ty.type_name as device_name,ty.parent_name as group_name,ty.grandpa_name as type_name,
+               col.id as collect_id, up.status as is_audit,h.search_num
         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 ma_up_off up on d.ma_id = up.ma_id
+                 left join ma_hot_search h on d.ma_id = h.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