From b95699652357c6218b45eceb81170ddfebb30e1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:06:25 +0800
Subject: [PATCH] fix conflect
---
src/main/resources/mapper/ColumnMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index ee49cf2..f5020c5 100644
--- a/src/main/resources/mapper/ColumnMapper.xml
+++ b/src/main/resources/mapper/ColumnMapper.xml
@@ -25,7 +25,7 @@
a.*
FROM
t_column a
- where a.parent_id = #{parentId} and a.company_id = #{belongId}
+ where a.parent_id = #{parentId} and a.company_id = #{companyId}
order by a.order_num ASC,a.create_time desc
</select>
@@ -33,4 +33,9 @@
select * from t_column
where column_code=#{code} and company_id=#{companyId}
</select>
+
+ <select id="selectColumnByParentId" resultType="com.xcong.farmer.cms.modules.system.entity.ColumnEntity">
+ select * from t_column
+ where parent_id=#{parentId} and company_id=#{companyId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1