From 03123e40dfda2aca60201e026b40503a5c3ac892 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 11:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/resources/mapper/ColumnMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index 3fdb807..f5020c5 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>
@@ -25,8 +25,17 @@
a.*
FROM
t_column a
- where a.parent_id = #{parentId} and a.company_id = #{belongId}
- order by a.create_time desc
+ where a.parent_id = #{parentId} and a.company_id = #{companyId}
+ order by a.order_num ASC,a.create_time desc
</select>
+ <select id="selectByCodeAndCompanyId" resultType="com.xcong.farmer.cms.modules.system.entity.ColumnEntity">
+ 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