fix(单位模块): 组织机构单位未排序

dev-user/src/main/java/com/tykj/dev/device/user/cache/AreaExhibitionCache.java

@@ -4,10 +4,7 @@ import com.tykj.dev.device.user.subject.entity.AreaExhibition;
 import com.tykj.dev.device.user.subject.entity.Units;
 import lombok.Data;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -61,7 +58,7 @@ public class AreaExhibitionCache {
      * 根据区域id查询下级以及
      */
     public List<AreaExhibition> findByFatherId(Integer fatherId){
-       return new ArrayList<>(idMap.values()).stream().filter(areaExhibition -> fatherId.equals(areaExhibition.getFatherId())).collect(Collectors.toList());
+       return new ArrayList<>(idMap.values()).stream().filter(areaExhibition -> fatherId.equals(areaExhibition.getFatherId())).sorted(Comparator.comparing(AreaExhibition::getOrders)).collect(Collectors.toList());
     }
 
     public AreaExhibitionCache refresh(List<AreaExhibition> areaExhibitionList){

dev-user/src/main/java/com/tykj/dev/device/user/cache/UnitsCache.java

@@ -41,7 +41,7 @@ public class UnitsCache {
     }
 
     public List<Units> findAllByAreaExhibitionId(Integer areaExhibitionId){
-        return new ArrayList<>(idMap.values()).stream().filter(units -> units.getExhibitionId().equals(areaExhibitionId)).collect(Collectors.toList());
+        return new ArrayList<>(idMap.values()).stream().filter(units -> units.getExhibitionId().equals(areaExhibitionId)).sorted(Comparator.comparing(Units::getShowOrder)).collect(Collectors.toList());
     }
 
     public List<Units> findAllByAreaExhibitionIdList(List<Integer> areaExhibitionIds){