From 1d6b0883200ef88cb2c8e1c1c88c3860113ea213 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 3 Jul 2024 16:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=83=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml | 2 +-
 .../mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
index 23e683f9..14bbac09 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
@@ -360,7 +360,7 @@
             <if test="portraitStatus != null">
                 and lfc.portrait_status = #{portraitStatus}
             </if>
-            Order by tpd.task_partition_sort,lfc.portrait_sn,lfc.content_sort
+            Order by tpd.task_partition_sort,lfc.portrait_sn,lfi.field_sort
         </select>
 
     <insert id="insertLabelFieldContentList">
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
index d6a5ede6..d8de48b8 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
@@ -253,7 +253,7 @@
                 and task_partition_dict_id is null
             </if>
         </where>
-        Order by ttd.task_type_sort,tpd.task_partition_sort
+        Order by ttd.task_type_sort,tpd.task_partition_sort,lfi.field_sort
     </select>
 
     <select id="selectLabelFieldNameByTaskPartitionDictIds"