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'
---
ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index 8c4c61f..e374302 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -42,7 +42,7 @@
<select id="selectDictDataList" parameterType="SysDictData" resultMap="SysDictDataResult">
<include refid="selectDictDataVo"/>
- <where>
+ where 1=1
<if test="dictType != null and dictType != ''">
AND dict_type = #{dictType}
</if>
@@ -54,10 +54,10 @@
</if>
<if test="guid != null and guid != ''">
AND guid = #{guid}
- </if> <if test="orgid != null and orgid != ''">
+ </if>
+ <if test="orgid != null and orgid != ''">
AND orgid = #{orgid}
</if>
- </where>
order by dict_sort asc
</select>
--
Gitblit v1.9.3