From 94462d19bb33abe9654781d791ae0163a3e0e37e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 一月 2026 16:29:07 +0800
Subject: [PATCH] 【丽水】微信已发送、已领取视为发送成功,不再进行补偿 改为 当前发送方式为微信的,且下一发送方式为短信的,微信发送状态为已发送、已领取的,跳过短信步骤

---
 ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
index 1efe6f1..ed3a343 100644
--- a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
@@ -27,7 +27,10 @@
 
     <select id="selectEquipmentinfoList" parameterType="Equipmentinfo" resultMap="EquipmentinfoResult">
         <include refid="selectEquipmentinfoVo"/>
-        <where>  
+        where 1=1
+            <if test="orgid != null and orgid != ''">
+                AND orgid = #{orgid}
+            </if>
             <if test="devtype != null "> and devtype = #{devtype}</if>
             <if test="equipmentname != null  and equipmentname != ''"> and equipmentname like concat('%', #{equipmentname}, '%')</if>
             <if test="modnum != null  and modnum != ''"> and modnum = #{modnum}</if>
@@ -40,7 +43,6 @@
             <if test="storePlace != null  and storePlace != ''"> and storePlace = #{storePlace}</if>
             <if test="technData != null  and technData != ''"> and technData = #{technData}</if>
             <if test="statusid != null "> and statusid = #{statusid}</if>
-        </where>
     </select>
     
     <select id="selectEquipmentinfoById" parameterType="Long" resultMap="EquipmentinfoResult">

--
Gitblit v1.9.3