bug54017相关人员责任领域展示顺序修改

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();

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">

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)) {