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/ColumnMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index 9aedea4..3ea4d55 100644
--- a/src/main/resources/mapper/ColumnMapper.xml
+++ b/src/main/resources/mapper/ColumnMapper.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
@@ -22,7 +25,7 @@
a.*
FROM
t_column a
- where a.parent_id = #{parentId}
+ where a.parent_id = #{parentId} and a.company_id = #{belongId}
order by a.create_time desc
</select>
--
Gitblit v1.9.1