|
@@ -148,7 +148,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectArchivesAutoFilePage" resultMap="archivesAutoResultMap">
|
|
|
- select * from u_archives_auto u where u.is_deleted = 0
|
|
|
+ select * from u_archives_auto u LEFT JOIN m_archive_tree_contract m ON u.node_id = m.id where u.is_deleted = 0
|
|
|
<if test="vo.projectId != null and vo.projectId != ''">
|
|
|
and u.project_id = #{vo.projectId}
|
|
|
</if>
|
|
@@ -172,7 +172,7 @@
|
|
|
#{nodeId}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- order by u.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,u.file_number,u.create_time asc
|
|
|
+ order by m.tree_sort,u.auto_file_sort is null ,u.auto_file_sort,u.file_number is null,u.file_number,u.create_time asc
|
|
|
limit #{current}, #{size}
|
|
|
</select>
|
|
|
|