From aa01829055f7711f6b46c40632997641e1a9e38d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 04 Jul 2022 19:54:13 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/ColumnMapper.xml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml
index 81380ce..ee49cf2 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.belong_id = #{record.belongId}
+                <if test="record.companyId != null">
+                    and a.company_id = #{record.companyId}
                 </if>
             </if>
         </where>
@@ -25,8 +25,12 @@
         a.*
         FROM
         t_column a
-        where a.parent_id = #{parentId} and a.belong_id = #{belongId}
-        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>
 
+    <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>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1