|
@@ -70,21 +70,13 @@ public class GetAllExpController extends BaseController {
|
|
|
|
|
|
List<ExpressType> allExps = basicInfoService.getExpressByStoreId(user.getStoreId()).get(1);
|
|
|
|
|
|
- /*//添加分拣中心快递类型
|
|
|
- ExpressType fjExp = new ExpressType();
|
|
|
- fjExp.setExpId(Integer.MAX_VALUE);
|
|
|
- fjExp.setExpName("分拣中心");
|
|
|
- allExps.add(0,fjExp);*/
|
|
|
- Collections.sort(allExps, new Comparator<ExpressType>() {
|
|
|
- @Override
|
|
|
- public int compare(ExpressType o1, ExpressType o2) {
|
|
|
- if(o1.getSort() > o2.getSort()){
|
|
|
- return 1;
|
|
|
- }else if(o1.getSort() < o2.getSort()){
|
|
|
- return -1;
|
|
|
- }else {
|
|
|
- return 0;
|
|
|
- }
|
|
|
+ Collections.sort(allExps, (o1, o2) -> {
|
|
|
+ if(o1.getSort() > o2.getSort()){
|
|
|
+ return 1;
|
|
|
+ }else if(o1.getSort() < o2.getSort()){
|
|
|
+ return -1;
|
|
|
+ }else {
|
|
|
+ return 0;
|
|
|
}
|
|
|
});
|
|
|
JsonObject object = new JsonObject();
|