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/BaseTagMapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml b/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
index f1e3884..7f0d50f 100644
--- a/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/BaseTagMapper.xml
@@ -41,7 +41,7 @@
<select id="selectBaseTagList" parameterType="com.smartor.domain.BaseTag" resultMap="BaseTagResult">
<include refid="selectBaseTagVo"/>
- <where>
+ where 1=1
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagname != null and tagname != ''">and tagname like concat('%', #{tagname}, '%')</if>
<if test="tagdescription != null and tagdescription != ''">and tagdescription = #{tagdescription}</if>
@@ -49,11 +49,10 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="isenable != null ">and isenable = #{isenable}</if>
- </where>
</select>
<select id="selectBaseTagListByTagname" parameterType="com.smartor.domain.BaseTag" resultMap="BaseTagResult">
<include refid="selectBaseTagVo"/>
- <where>
+ where 1=1
<if test="tagcategoryid != null ">and tagcategoryid = #{tagcategoryid}</if>
<if test="tagname != null and tagname != ''">and tagname =#{tagname}</if>
<if test="tagdescription != null and tagdescription != ''">and tagdescription = #{tagdescription}</if>
@@ -61,7 +60,6 @@
<if test="isupload != null ">and isupload = #{isupload}</if>
<if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
<if test="isenable != null ">and isenable = #{isenable}</if>
- </where>
</select>
<select id="selectBaseTagByTagid" parameterType="Long" resultMap="BaseTagResult">
--
Gitblit v1.9.3