From 4291dd51d4de338e1f7da2936e01c76a45b0c5a9 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Mon, 4 Dec 2023 13:05:55 +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 4af7162..a7b444e 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
@@ -10,4 +10,5 @@ import lombok.ToString;
 public class DevInfoVo extends DevInfo {
     private long parentId;
     private String typeName;
+    private String companyName;
 }
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 fe2aca8..fe93899 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -37,9 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectDevInfoList" parameterType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
-        select d.*,t.type_name
+        select d.*,t.type_name,c.company_name
         from ma_dev_info d
         left join ma_type_info t on d.type_id = t.type_id
+        left join bm_company_info c on d.own_co = c.company_id
         <where>  
             <if test="maId != null "> and d.ma_id = #{maId}</if>
             <if test="code != null  and code != ''"> and d.code = #{code}</if>