From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
index f3b8ac0..16cf8f2 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteFolderMapper.xml
@@ -12,18 +12,7 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
- <!-- 关联 ArdRouteFile 对象 -->
- <association property="ardRouteFile"
- javaType="com.ard.route.domain.route.ArdRouteFile"
- column="folder_id"
- autoMapping="true"
- select="selectArdRouteFile">
- </association>
</resultMap>
-
- <select id="selectArdRouteFile" resultType="com.ard.route.domain.route.ArdRouteFile">
- select * from ard_route_file where id = #{folderId}
- </select>
<sql id="selectArdRouteFolderVo">
select id,
@@ -40,11 +29,12 @@
<include refid="selectArdRouteFolderVo"/>
<where>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
- <if test="createdBy != null and createdBy != ''"> and created_by = #{createdBy}</if>
- <if test="createdTime != null "> and created_time = #{createdTime}</if>
- <if test="updatedBy != null and updatedBy != ''"> and updated_by = #{updatedBy}</if>
- <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+ <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
+ <if test="createTime != null "> and create_time = #{createTime}</if>
+ <if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy}</if>
+ <if test="updateTime != null "> and update_time = #{updateTime}</if>
</where>
+ order by serial_number asc
</select>
<select id="selectArdRouteFolderById" parameterType="String" resultMap="ArdRouteFolderResult">
--
Gitblit v1.9.3