From 3dff0c3b350b79039ef21ed38c02e5d0a0eea795 Mon Sep 17 00:00:00 2001
From: zfhai <15856818120@163.com>
Date: Fri, 8 Dec 2023 14:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 d4df72e..94ec0b3 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -148,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  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 ma_type_info t on d.type_id = t.type_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
@@ -155,9 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                           left join ma_type_info p on t.parent_id=p.type_id) tt
                     left join ma_type_info pp on tt.p_parent_id = pp.type_id
         ) ty on d.type_id=ty.type_id
-        where d.ma_id = #{maId}
-                 left join ma_type_info t on d.type_id = t.type_id
-        where d.ma_id = #{maId}  and  d.is_active='1'
+        where d.ma_id = #{maId} and  d.is_active='1'
     </select>
 <!--    <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.equip.api.domain.vo.DevInfoVo">-->
 <!--        select d.*,c.company_name,c.create_time as company_create_time,c.logo_url as company_logo_url,-->