From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 27 Oct 2021 16:59:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml b/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml
index 56dc56b..93e6b96 100644
--- a/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/EncodeReplaceDictMapper.xml
@@ -44,10 +44,14 @@
and number = #{p_number}
</if>
<if test="type != null">
- and type = #{type,}
+ and type = #{type}
</if>
</where>
+
order by update_time desc
+ <if test="first != null and pageSize != null">
+ limit #{first},#{pageSize}
+ </if>
</select>
<select id="countAll" resultType="java.lang.Integer">
select count(1)
--
Gitblit v1.9.2