From 8099c6ada39af31b5f150622da6c82f1019aaf7e Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Tue, 26 Nov 2024 13:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/material/device/DevInfoMapper.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index e9afaf3..97ee84f 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -227,7 +227,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mt1.type_id as firstId,
             mt1.type_name as firstName,
             GROUP_CONCAT(CONCAT(mt1.type_name, '/', mt2.type_name, '/', mt3.type_name)) AS groupName,
-            h.search_num as searchNum
+            h.search_num as searchNum,
+            d.create_time as createTime,
+            d.update_time as updateTime
         FROM
             ma_dev_info d
         LEFT JOIN bm_company_info c ON d.own_co = c.company_id
@@ -623,7 +625,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCompany" resultType="java.lang.Integer">
-        select COUNT(1) from ma_dev_info where ma_status = '2' and company_id = #{companyId}
+        select COUNT(1) from ma_dev_info where ma_status = '2' and own_co = #{companyId}
     </select>
 
     <select id="getCompanyUpNum" resultType="java.lang.Integer">