From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/NavigationBarMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/NavigationBarMapper.xml b/src/main/resources/mapper/NavigationBarMapper.xml
index 347307a..65bda7f 100644
--- a/src/main/resources/mapper/NavigationBarMapper.xml
+++ b/src/main/resources/mapper/NavigationBarMapper.xml
@@ -12,8 +12,8 @@
<if test="record.parentId != null">
and a.parent_id = #{record.parentId}
</if>
- <if test="record.belongId != null">
- and a.belong_id = #{record.belongId}
+ <if test="record.companyId != null">
+ and a.company_id = #{record.companyId}
</if>
</if>
</where>
@@ -26,8 +26,9 @@
FROM
t_navigation_bar a
where a.parent_id = #{parentId}
- and a.belong_id = #{belongId}
- order by a.create_time desc
+ and a.company_id = #{belongId}
+
+ order by a.order_num ASC, a.create_time desc
</select>
<select id="selectListByParentId" resultType="com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity">
@@ -36,7 +37,7 @@
FROM
t_navigation_bar a
where a.parent_id = #{parentId}
- and a.belong_id = #{belongId}
+ and a.company_id = #{belongId}
order by a.create_time desc
</select>
--
Gitblit v1.9.1