From 9cf100c790066000ba4503d3412685322df38e29 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 14 Jun 2022 11:19:10 +0800
Subject: [PATCH] =?UTF-8?q?bug54017=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=B1=95=E7=A4=BA=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/system/mapper/SysDictItemMapper.java     | 4 ++--
 .../project/mapper/xml/ProjectRelatedPersonnelMapper.xml      | 2 +-
 .../service/impl/ProjectRelatedPersonnelServiceImpl.java      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
index d29ae13b7..2e1b9b0d6 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictItemMapper.java
@@ -23,8 +23,8 @@ public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
     @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sort_order asc, item_value asc")
     public List<SysDictItem> selectItemsByDictCode(String dictCode);
 
-    @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by create_time asc")
-    public List<SysDictItem> selectItemsOrderByCreateTime(String dictCode);
+    @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.sort_order asc")
+    public List<SysDictItem> selectItemsOrderBySortOrder(String dictCode);
 
     @Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1")
     List<SysDictItem> selectItemsAll();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
index 72783830d..2ab452dd2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRelatedPersonnelMapper.xml
@@ -44,7 +44,7 @@
             </if>
             AND sd.dict_code = #{dictCode}
         </where>
-        ORDER BY sdi.create_time
+        ORDER BY sdi.sort_order
     </select>
 
     <select id="queryById" resultType="com.jero.modules.project.entity.ProjectRelatedPersonnel">
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
index 1de13a1ab..fa32b479c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
@@ -665,7 +665,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
 			cell.setCellStyle(cellStyleTemp);
 
 			//查标签内容里的责任领域数据
-			List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsOrderByCreateTime(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
+			List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsOrderBySortOrder(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
 			List<String> dataList = dutyTerritory.stream().filter(e->e.getDelFlag()== CommonConstant.DEL_FLAG_0).map(e -> e.getItemText()).collect(Collectors.toList());
 			//设置导出数据
 			if(CollectionUtils.isNotEmpty(dataList)) {