From 8ef3693f9a10ebdb2f54a61bd81a2c600c3d8813 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Jun 2022 11:50:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/resources/mapper/NavigationBarMapper.xml |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/NavigationBarMapper.xml b/src/main/resources/mapper/NavigationBarMapper.xml
index 5dfa1cc..0aef3ca 100644
--- a/src/main/resources/mapper/NavigationBarMapper.xml
+++ b/src/main/resources/mapper/NavigationBarMapper.xml
@@ -12,6 +12,9 @@
                 <if test="record.parentId != null">
                     and a.parent_id = #{record.parentId}
                 </if>
+                <if test="record.companyId != null">
+                    and a.company_id = #{record.companyId}
+                </if>
             </if>
         </where>
         order by a.create_time desc
@@ -23,6 +26,17 @@
         FROM
         t_navigation_bar a
         where a.parent_id = #{parentId}
+          and a.company_id = #{belongId}
+        order by a.create_time desc
+    </select>
+
+    <select id="selectListByParentId" resultType="com.xcong.farmer.cms.modules.system.entity.NavigationBarEntity">
+        SELECT
+            a.*
+        FROM
+            t_navigation_bar a
+        where a.parent_id = #{parentId}
+          and a.company_id = #{belongId}
         order by a.create_time desc
     </select>
 

--
Gitblit v1.9.1