From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml b/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
index c55a7c3..b2b30bd 100644
--- a/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SchemeTriggerruleMapper.xml
@@ -63,7 +63,7 @@
 
     <select id="selectSchemeTriggerruleList" parameterType="SchemeTriggerrule" resultMap="SchemeTriggerruleResult">
         <include refid="selectSchemeTriggerruleVo"/>
-        <where>
+        where 1=1
             <if test="conditionstype != null ">and conditionstype = #{conditionstype}</if>
             <if test="orand != null ">and orand = #{orand}</if>
             <if test="ruleconditions != null  and ruleconditions != ''">and ruleconditions = #{ruleconditions}</if>
@@ -88,7 +88,6 @@
             <if test="groupnumber != null ">and groupnumber = #{groupnumber}</if>
             <if test="grouporand != null ">and grouporand = #{grouporand}</if>
             <if test="isrequired != null ">and isrequired = #{isrequired}</if>
-        </where>
     </select>
 
     <select id="selectSchemeTriggerruleById" parameterType="Long" resultMap="SchemeTriggerruleResult">

--
Gitblit v1.9.3