From 97641c088c44dd60f63e697466c73613a1c63262 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 02 Jul 2022 21:37:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ColumnMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index 3fdb807..eb425ab 100644
--- a/src/main/resources/mapper/ColumnMapper.xml
+++ b/src/main/resources/mapper/ColumnMapper.xml
@@ -12,8 +12,8 @@
<if test="record.parentId != null">
and a.parent_id = #{record.parentId}
</if>
- <if test="record.belongId != null">
- and a.company_id = #{record.belongId}
+ <if test="record.companyId != null">
+ and a.company_id = #{record.companyId}
</if>
</if>
</where>
@@ -26,7 +26,7 @@
FROM
t_column a
where a.parent_id = #{parentId} and a.company_id = #{belongId}
- order by a.create_time desc
+ order by a.order_num ASC,a.create_time desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1