From 2736d16a8b1804f7291a56a147f76ef3584d6619 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 04 Jul 2022 19:35:31 +0800 Subject: [PATCH] fix 上传模板和查看栏目修改 --- src/main/resources/mapper/ColumnMapper.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml index 9aedea4..eb425ab 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,8 @@ 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 = #{belongId} + order by a.order_num ASC,a.create_time desc </select> </mapper> \ No newline at end of file -- Gitblit v1.9.1