From 0c392a056cd8eaf333c3019f5ff4142b65881332 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Mon, 4 Dec 2023 13:21:07 +0800
Subject: [PATCH] fix

---
 .../com/bonus/zlpt/equip/mapper/DevInfoMapper.java |  2 +-
 .../bonus/zlpt/equip/service/IDevInfoService.java  |  2 +-
 .../equip/service/impl/DevInfoServiceImpl.java     |  2 +-
 .../src/main/resources/mapper/DevInfoMapper.xml    | 14 ++++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
index 6438129..2fbc585 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
@@ -18,7 +18,7 @@ public interface DevInfoMapper
      * @param maId 设备信息主键
      * @return 设备信息
      */
-    public DevInfo selectDevInfoByMaId(Long maId);
+    public DevInfoVo selectDevInfoByMaId(Long maId);
 
     /**
      * 查询设备信息列表
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
index e8f701f..6cf8282 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IDevInfoService.java
@@ -18,7 +18,7 @@ public interface IDevInfoService
      * @param maId 设备信息主键
      * @return 设备信息
      */
-    public DevInfo selectDevInfoByMaId(Long maId);
+    public DevInfoVo selectDevInfoByMaId(Long maId);
 
     /**
      * 查询设备信息列表
diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
index 64f11a3..bed762b 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/impl/DevInfoServiceImpl.java
@@ -29,7 +29,7 @@ public class DevInfoServiceImpl implements IDevInfoService
      * @return 设备信息
      */
     @Override
-    public DevInfo selectDevInfoByMaId(Long maId)
+    public DevInfoVo selectDevInfoByMaId(Long maId)
     {
         return devInfoMapper.selectDevInfoByMaId(maId);
     }
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 fe93899..6a68975 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -3,7 +3,6 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.zlpt.equip.mapper.DevInfoMapper">
-    
     <resultMap type="com.bonus.zlpt.common.core.domain.equip.DevInfo" id="DevInfoResult">
         <result property="maId"    column="ma_id"    />
         <result property="code"    column="code"    />
@@ -39,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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,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
+            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>
@@ -67,9 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectDevInfoByMaId" parameterType="Long" resultMap="DevInfoResult">
-        <include refid="selectDevInfoVo"/>
-        where ma_id = #{maId}
+    <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo">
+        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 d.ma_id = #{maId}
     </select>
         
     <insert id="insertDevInfo" parameterType="com.bonus.zlpt.common.core.domain.equip.DevInfo">