Merge branch 'master' of http://lanpucloud.cn:1111/r/herb

zhuguifei

昨天 a0a030ec98b711e82720be38c6ea9ddf4a07a22b

 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/MobileController.java

old mode 100755
new mode 100644
@@ -167,12 +167,23 @@
                String st = client.getString("connectedAt");
                vo.setUpTime(st);
                vo.setClientId(clientid);
            }else{
                vo.setClientId(clientid);
                vo.setOnline(false);
            }
            return vo;
        }).collect(Collectors.toList());
        //排序
        collect.sort(Comparator.comparing(obj -> obj.getCode(), Comparator.nullsLast(Comparator.naturalOrder())));
        collect.sort(Comparator.comparing(obj -> obj.getOnline(), Comparator.nullsLast(Comparator.naturalOrder())));
        collect.sort(
                Comparator.comparing(
                                MoEquVo::getOnline,
                                Comparator.nullsLast(Comparator.reverseOrder())  // true 在前，false 在后，null 最后
                        )
                        .thenComparing(
                                DryEquipment::getCode,
                                Comparator.nullsLast(Comparator.naturalOrder())  // code 升序，null 最后
                        )
        );
        BeanUtils.copyProperties(pageList, page);
        page.setRecords(collect);
    }