From 843492ccba0555bc0f8dc104efc6388fa650cd17 Mon Sep 17 00:00:00 2001
From: redamancy_zxp <2638265504@qq.com>
Date: Fri, 15 Apr 2022 03:39:53 +0000
Subject: [PATCH] =?UTF-8?q?update=20springboot/wumei-iot/src/main/resource?=
 =?UTF-8?q?s/mapper/iot/FirmwareMapper.xml.=20=E5=AF=B9=E4=BA=8E=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=9B=BA=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=A4=84=E5=81=9A?=
 =?UTF-8?q?=E5=87=BA=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BF=9D=E8=AF=81=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E5=9B=BA=E4=BB=B6=E5=92=8C=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E5=88=9B=E5=BB=BA=E7=9A=84=E5=9B=BA=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/iot/FirmwareMapper.xml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml
index f9cf3ba3..6a247441 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/FirmwareMapper.xml
@@ -23,16 +23,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select firmware_id, firmware_name, product_id, product_name, tenant_id, tenant_name, is_sys, version, file_path, create_time,  update_time, remark from iot_firmware
     </sql>
 
+    
     <select id="selectFirmwareList" parameterType="com.ruoyi.iot.domain.Firmware" resultMap="FirmwareResult">
         <include refid="selectFirmwareVo"/>
-        <where>  
+        <where>
             <if test="firmwareName != null  and firmwareName != ''"> and firmware_name like concat('%', #{firmwareName}, '%')</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="tenantName != null  and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%')</if>
+            <if test="tenantName != null  and tenantName != ''"> and tenant_name like concat('%', #{tenantName}, '%') or is_sys = 1</if>
             <if test="isSys != null "> and is_sys = #{isSys}</if>
-            <if test="isSys == null "> and is_sys = 1</if>
         </where>
-       order by create_time desc
+      order by create_time desc
     </select>
     
     <select id="selectFirmwareByFirmwareId" parameterType="Long" resultMap="FirmwareResult">