From a88bc9d86256d94dcb4580d43bd88b3f19e98c15 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 16:06:38 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/ColumnMapper.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index 9aedea4..e4022c0 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,8 +25,52 @@
a.*
FROM
t_column a
- where a.parent_id = #{parentId}
- 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}
+ <if test="isNav == 1">
+ and is_nav=1
+ </if>
+ </select>
+
+ <select id="selectColumnInPage" resultType="com.xcong.farmer.cms.modules.system.entity.ColumnEntity">
+ select
+ *
+ from t_column
+ where company_id=#{companyId}
+ <if test="record.ids != null">
+ and id in
+ <foreach collection="record.columnIds" item="item" open="(" close=")" separator=",">
+ ${item}
+ </foreach>
+ </if>
+ </select>
+
+
+ <select id="selectWebColumnInListByParentId" resultType="com.xcong.farmer.cms.modules.system.vo.WebColumnVo">
+ SELECT
+ a.*
+ FROM
+ t_column a
+ where a.parent_id = #{parentId} and a.company_id = #{companyId}
+ order by a.order_num ASC,a.create_time desc
+ </select>
+
+ <select id="selectColumnIdsByParentId" resultType="java.lang.Long">
+ select
+ a.id
+ FROM
+ t_column a
+ where a.parent_id = #{parentId} and a.company_id = #{companyId}
+ order by a.id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1