设备类别排序

@@ -3,10 +3,7 @@ package com.skua.modules.equipment.service.impl;
 import java.io.FileInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +43,12 @@ public class EquipmentCategoryServiceImpl extends ServiceImpl<EquipmentCategoryM
 	public List<TreeData> tree(int tag) {
 	public List<TreeData> tree(int tag) {
 		//获取数据列表
 		//获取数据列表
 		List<EquipmentCategory> list=queryList();
 		List<EquipmentCategory> list=queryList();
+		list.forEach(item -> {
+			if (item.getSort() == null) {
+				item.setSort(10000);
+			}
+		});
+		Collections.sort(list, Comparator.comparing(EquipmentCategory::getSort));
 		//将业务数据转换为构造树所需的数据结构
 		//将业务数据转换为构造树所需的数据结构
 		List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
 		List<TransTreeModel> transTreeModels = list.stream().map(bo -> convertToTreeModel(bo)).collect(Collectors.toList());
 		List<TreeData> treeList=TreeUtils.buildTreeForParentId(transTreeModels, "root");
 		List<TreeData> treeList=TreeUtils.buildTreeForParentId(transTreeModels, "root");